UNSTABLE: Tries to add multi threaded Peers.
Merged Conflitcts