Work on infrastructure for handling groups.