moved some stuff around
stuff.
modified code to allow classification
Merge branch 'Multithread' of https://github.com/Carterj3/watson into Multithread