[WIP] Peer refactor