P2P now works (few bugs present)