updates to work better as app with app_server
add navigation calcs