In progress refactor od dock to aggregator class