Not verified, but the code runs here.  Need to add time printing, and stats, then verify against old versions of the code and published benchmarks, but the code at least runs here.