WIP for adding groups