WIP: Seems to pass basic tests now with run_benchmarks.  40 configs.