More work on navigation simulation.