Now using built in features for replay mode, and a little refactoring.