Working on adding groups