Added a couple of TODOs regarding group_by()