Overhaul is pretty much done. It should be easy to turn on and off different estimators so we can look at multiple for the same run. Should be much easier to include additional estimators as well.