Add in routes for steps 6-8.
Resolve merge conflict.