Make PeerID an array again. Use a struct for handshake. Both as suggested by Jay