Add selection groups
Merge branch 'feature/groups' into development