Navigation logic done - #14