More Changes to Navigator, Implements upwind mode