Started adding things for user authentication.
merge?