Group support

I made a new pull request against master. #4 needs to be done first.