[2.1] [FEATURE WIP] Groups

Yeah, shall sort.