Angular groups

(WIP)