badaas refactorig: DI, admin