added some helper functions to the Navigator class, tests passing