Table grouping partially implemented