stages 1-6
Merge pull request #176 from SUNY-Albany-CCI-INF362/Navigation-repair

stages 1-6