Merge pull request #1 from Norse900/InitialRefactoringOfNavigationAndLogic

Initial refactoring of navigation and logic
Merge pull request #2 from Norse900/master

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