Updated roughly working peer-peer