Get key exchange working.
Merge.