added todo for handshake