yet another refactoring of peer comms.