Pairing

Bring in pairing mode changes to the messages.