Thanks, I appreciate the help with the merge, but the issue isn't with the merge but with finishing the work. I was working on AEAD, then need to finish the certificate functions and encrypt/decrypt using certificates. Also, we're tracking down a bug in the base code, so that takes priority. I should get back to this in the next month or so.