Shuffled some code around for Peers.