Fixing routes
WIP post09