Almost got dI working again
Dependency injection reworked