Merge pull request #2 from Norse900/master

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

Merge pull request #2 from Norse900/master