Weekend updata

Fixed issues stemming from overhaul. Added some functionality to get
ready for running experiments and making comparisons
Lots of changes since git wouldn't work for a while