diff --git a/include/rosa/agent/State.hpp b/include/rosa/agent/State.hpp
index d9a6495..37236e2 100644
--- a/include/rosa/agent/State.hpp
+++ b/include/rosa/agent/State.hpp
@@ -1,34 +1,42 @@
 //===-- rosa/agent/State.hpp ----------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/State.hpp
 ///
 /// \author Maximilian Götzinger (maximilian.goetzinger@tuwien.ac.at)
 ///
 /// \date 2019
 ///
 /// \brief Definition of *state* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_STATE_HPP
 #define ROSA_AGENT_STATE_HPP
 
 #include "rosa/agent/Functionality.h"
+#include "rosa/agent/History.hpp"
 
 namespace rosa {
 namespace agent {
+
+/// \tparam D type of data
+template <typename D> class State : public Functionality {
 	
+private:
+  History history;
+
+public:
+  State(D Intercept, D Coefficient) noexcept
+      : history<D, R>(history) {}
 	
-	
-	
-	
-	
-	
+
+};
+		
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_STATE_HPP
\ No newline at end of file
diff --git a/include/rosa/agent/StateDetector.hpp b/include/rosa/agent/StateDetector.hpp
index dbb5f3f..7e8bdcf 100644
--- a/include/rosa/agent/StateDetector.hpp
+++ b/include/rosa/agent/StateDetector.hpp
@@ -1,34 +1,41 @@
 //===-- rosa/agent/StateDetector.hpp ----------------------------*- C++ -*-===//
 //
 //                                 The RoSA Framework
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file rosa/agent/StateDetector.hpp
 ///
 /// \author Maximilian Götzinger (maximilian.goetzinger@tuwien.ac.at)
 ///
 /// \date 2019
 ///
 /// \brief Definition of *state detection* *functionality*.
 ///
 //===----------------------------------------------------------------------===//
 
 #ifndef ROSA_AGENT_STATEDETECTOR_HPP
 #define ROSA_AGENT_STATEDETECTOR_HPP
 
 #include "rosa/agent/Functionality.h"
 
 namespace rosa {
 namespace agent {
 	
+/// A special \c rosa::Agent with its own state.
+class MyAgent {
 	
+private:
+  unsigned int discreteAveragePartitionCounter;
+
+public:
+    
 	
 	
 	
 	
 	
 } // End namespace agent
 } // End namespace rosa
 
 #endif // ROSA_AGENT_STATEDETECTOR_HPP
\ No newline at end of file