Merged peerdiscovery with chris's bossman version