Moved everything to EncryptionService intent calls
Fancied up code, now only one method makes the intent calls