rework to allow for data by usergroup