[WIP] Add groupBy