Implement Navigation: closes #1576