Group Management

+ Minor refactoring
+ Added a nice class called GroupDelegator