[P1BIGROCKS-1825](https://jira.il2.dso.mil/browse/P1BIGROCKS-1825) Epic &3 should be completed prior to this epic to avoid duplicating work