Step 2 forward towards implementing Multithreaded Peers. Still not complete.