Feature/agg

Merging this alternative way of doing aggregation