Mid-WIP commit ... hacking toward PairingSessions