Added threads and what not
Revert "Added threads and what not"

This reverts commit ed9d04c24dc848a0540e37bd44fc7eb4b14d9d60.