Re-writing Navigator and Pilot classes