Partial implementation of peer-peer interface #5