changed names, working on logout feature