adding navigate proto and better routing