This moves responsibilities closer to each other.

Also fix the problem with the group being hard-coded.