seperation of common code between group and controller, refactor of
controller almost complete