Add Sort Grouping (preliminary)