Started rewriting our classes to mesh with Peter's tests. Based on the method for executing Monte Carlo used in Orego.