[2.1] [FEATURE WIP] Groups

Shall I send a pull to your fork to fix this and the other stuff?