Adding user groups closing #1