Added group listing and turning on/off