(fix) Restructure routing a bit. Setup initial test
Merge pull request #9 from marcwilhite/canary

(fix) Restructure routing a bit. Setup initial test