Continuing work on navigation
- More testing
- Less dependency on "internal" knowledge