Navigation works now.  Needs to make some cleanup in code.