Add encryption and NFC

This is a PR to update our project to match our local Repo.