Another WIP for grouping when using remote data.