Add in group functionality, resource model for frontend, clean up naming