[WIP] PeerFinder and unit tests work