Updated the simulation (and dropped in a class file...)