Merge in Passport Changes

Hey Nate,

I think I am doing this right. Can you merge in my changes for passport. This includes some new files as well. Let me know if you have any questions.