Router updates
Almost done with routers
Done