handshake
Merged simple message passing changes