ADDED: the proper key exchange class

Changed the encrpytion methods to use the correct class for the actual encryption. However, there is currently a problem when the contact receives the message and attempts to decrypt it. It fails to decrypt.