TASK-8: Get P2P working, half there
Merge pull request #12 from DanLatimer/topic/TASK-8

TASK-8: Get P2P working, half there