WIP on groups, somewhat broken