Added a simulation class for the before-match options that will be implemented later on, and modified some code to match that