WIP: Fixing routes.