Groups now work as Rachel intended
Merging with rswag branch