More work on encryption - Build currently broken, sorry!
Clean slate when working on encryption.  Will do using BaseMessages.  You know, the way I freaking designed this framework to be able to handle.