Starting to add group stuff - rebase this later