Fixed some things

So there is still an issue with getting the actual routers but
everything should be working in the correct order.