Use a new router

For #9 
Also should not be exported.