Merge pull request #1 from Norse900/InitialRefactoringOfNavigationAndLog...

...ic

Initial refactoring of navigation and logic