Refactor :ok_hand:
Add phases to aggregate
Refactor createAggregate :ok_hand: