[2.1] [FEATURE WIP] Groups

I'll send a pull to your repo...