Use a new router

For #9 
This shouldn't be exported.