Tonight's work - some better parallelization, but lots of commented code...