cleanup to navigate- not complete
trying to fix merge issues
fixing merge issues
fixed merge conflicts
cleaned up