Continued work on navigation - ugh