Made some routing changes; there's lots of room for improvement, but I'm happy with this time!