Begin adding data set grouping functionality