New test code for better parallelization
Tonight's work: almost done, but a lot of cleanup to do.