[2.1] [FEATURE WIP] Groups

I've already done it.