Implement new style grouping
New style aggregation results
Update TODO