Work in progress, modified naviagtion