Groups

Added some group functionality. Figured your fork would be the best to add to at the moment.