Parser complete but with bugs ; added new MachineStateWrapper class