Added the group features. Haven't done any testing yet