Wip/peer

Nearly ready?