Navigator porting WIP
Navigator History porting WIP