PeerFinder Work
PeerFinder Work (Peer/Peers Refactor)