Broke out the group class into its own thing.