Added binary handshake todo