Added NavigationSystem stub, fixed clock, added ground work for refactoring