Use a new router

For #9 
I need to double-check to make sure this is correct...