Refactors router into state manager
Fix health view bug introduced after rebasing
Merge pull request #20 from jamesdphillips/state_manager

Refactors router into state manager