Refactoring of router to closer match proper usage; Should fix false values on page load.  Fixes #19