Working correctly now. Parallelization pending.