Embarrassingly messy new-feature-hackage

Embarrassingly messy new-feature-hackage. Stuff to do with groups, users, teams etc.