Removed all threading in preperation for parallelization model