Finish the addGroup and groupList functions