lots more navigation work