Use a new router

For #9 
Just checked. Looks good to me.