Implement handshake prototype behind a feature flag

which old handlers do we want to remove?