Fixes #13 - Add handshaking