Still converting to use Handshake. Work in progress.