Epic &3 should be completed prior to this epic to avoid duplicating work