a little refactoring and switching around
more shuffle shuffle
refac
route shuffle
merge
Merge pull request #197 from balanced/refac

Refactor and shuffle