begun implementation of new routing system
refactored to include dependency injection
removed setter dependency injection in Model