Added more functionality to routing
Finished debugging routing