Did a bunch of stuff
Merge pull request #33 from tsamb/finish_routing_tasks

Did a bunch of stuff and things