Ipmlement handshake prototype behind a feature flag

This can be removed