Groups are handled now

Groups are now handled