syncing with master
trying to sync with master
working on button to change show user view