issue #235 - first pass on handshake utility