TASK-8: Get P2P working, half there