Use a new router

For #9