bunch of updated to get navigation ogic working