Working on groups
Removing nasty DI, use more readable facades for repos