Adding route lines and slight refactoring.
Cleaning up latest changes.