Navigation logic almost complete