#1 - Refactoring to allow encryptors to be a service.