Initial implementation of navigation logic