2014.7.8.1943

Added more to the navigation app.  Need to revisit approach to state triggering.