Adding more dependency injection, not quite working yet