started refactoring of navigator (not working)
Authored by: klafekie 2016-09-08
Parent: [r135]
Child: [r137]