Adding in passphrase encryption services
This reverts commit 7dda8276ab0f1aa6e9e7875e34a9b58e15d43e22.
Merge branch 'passphrase_key_service'