New router, almost done