Simpler test
Retooling P2P data structure