tidy up group stuff, need to rethink it a little