Index: /trunk/FACT++/Makefile.am
===================================================================
--- /trunk/FACT++/Makefile.am	(revision 14130)
+++ /trunk/FACT++/Makefile.am	(revision 14131)
@@ -333,5 +333,9 @@
 
 
-dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h src/InterpreterV8.cc src/InterpreterV8.h
+dimctrl_SOURCES = src/dimctrl.cc \
+	src/StateMachineDimControl.cc src/StateMachineDimControl.h \
+	src/RemoteControl.cc src/RemoteControl.h \
+	src/InterpreterV8.cc src/InterpreterV8.h \
+	 src/DimState.h src/DimState.cc
 dimctrl_LDADD = libStateMachine.la libTools.la libTime.la \
 	libDim++.la libDim.la libDimExtension.la libConfiguration.la
Index: /trunk/FACT++/Makefile.in
===================================================================
--- /trunk/FACT++/Makefile.in	(revision 14130)
+++ /trunk/FACT++/Makefile.in	(revision 14131)
@@ -221,6 +221,8 @@
 did_OBJECTS = $(am_did_OBJECTS)
 did_DEPENDENCIES = libDim.la
-am_dimctrl_OBJECTS = src/dimctrl.$(OBJEXT) src/RemoteControl.$(OBJEXT) \
-	src/InterpreterV8.$(OBJEXT)
+am_dimctrl_OBJECTS = src/dimctrl.$(OBJEXT) \
+	src/StateMachineDimControl.$(OBJEXT) \
+	src/RemoteControl.$(OBJEXT) src/InterpreterV8.$(OBJEXT) \
+	src/DimState.$(OBJEXT)
 dimctrl_OBJECTS = $(am_dimctrl_OBJECTS)
 dimctrl_DEPENDENCIES = libStateMachine.la libTools.la libTime.la \
@@ -953,5 +955,10 @@
 argv_SOURCES = src/argv.cc
 argv_LDADD = libConfiguration.la
-dimctrl_SOURCES = src/dimctrl.cc src/RemoteControl.cc src/RemoteControl.h src/InterpreterV8.cc src/InterpreterV8.h
+dimctrl_SOURCES = src/dimctrl.cc \
+	src/StateMachineDimControl.cc src/StateMachineDimControl.h \
+	src/RemoteControl.cc src/RemoteControl.h \
+	src/InterpreterV8.cc src/InterpreterV8.h \
+	 src/DimState.h src/DimState.cc
+
 dimctrl_LDADD = libStateMachine.la libTools.la libTime.la \
 	libDim++.la libDim.la libDimExtension.la libConfiguration.la
@@ -1336,7 +1343,11 @@
 src/dimctrl.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
+src/StateMachineDimControl.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
 src/RemoteControl.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 src/InterpreterV8.$(OBJEXT): src/$(am__dirstamp) \
+	src/$(DEPDIR)/$(am__dirstamp)
+src/DimState.$(OBJEXT): src/$(am__dirstamp) \
 	src/$(DEPDIR)/$(am__dirstamp)
 dimctrl$(EXEEXT): $(dimctrl_OBJECTS) $(dimctrl_DEPENDENCIES) 
@@ -1651,4 +1662,5 @@
 	-rm -f src/DimSetup.$(OBJEXT)
 	-rm -f src/DimSetup.lo
+	-rm -f src/DimState.$(OBJEXT)
 	-rm -f src/DimWriteStatistics.$(OBJEXT)
 	-rm -f src/DimWriteStatistics.lo
@@ -1687,4 +1699,5 @@
 	-rm -f src/StateMachineDim.$(OBJEXT)
 	-rm -f src/StateMachineDim.lo
+	-rm -f src/StateMachineDimControl.$(OBJEXT)
 	-rm -f src/StateMachineImp.$(OBJEXT)
 	-rm -f src/StateMachineImp.lo
@@ -1797,4 +1810,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimServiceInfoList.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimSetup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/DimWriteStatistics.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Event.Plo@am__quote@
@@ -1819,4 +1833,5 @@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/StateMachine.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/StateMachineDim.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/StateMachineDimControl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/StateMachineImp.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/Time.Plo@am__quote@