WIP on aggregation
merge