More Work on Navigation, etc.

Both of us