Routing now working properly