changed to DI, borked everything real hard