WIP fix route generator