Navigation code review

Closes gh-5.