implemented questionable  parallel processing
fixed merge issues with the parallel processing stuff