Getting the refactored aggregator together