Reworked epics
Rebased