Finished organising the DI, hopefully.