Re-working Handshake/Response code with limited success.