WIP simpler parallelization
tests passing, need to move parallelization to core