First pass at adding groupings for stats. #1365