quick commit for review. first half of message encryption changes