Working on the threading.

Wahoo.... I think I might just be through the thread issues. Defiantly room for extraction now, but that will have to wait a bit.