Pre-Merge
Merged in master
Got threading working