Make better use of th the grouping everything to a List.