Added TheorySimulator, clone() methods to appropriate classes
Fixed merge?