Dependency framework all set up... about to start refactoring everything to fit