More untested work on contact exchange.