Update: working on completing dependency injection