route, refactor pt 1.5