Fixed more routing, almost done