furthering the nav work, still buggy