Use a new router

For #9 
This entire thing can be removed, I think.