(master) WIP on add group