Reworking peer.code