Refactors to prepare for moving the aggregation logic back into the workers

Refactors to prepare for moving the aggregation logic back into the workers #414