WIP: better route toggling and selection