Added in passport logic to allow for sign-ins.
Made necessary merge changes.