Navigator

In progress. Features that used to hang off the Navigator interface, but have since been removed.