Encrypting from a pkcs cert
Some major cleanup and initial tests