work in progress-DI wiring