WIP: new p2p policies