Halfway through cleaning up grouping