Added group functionality and stuff