diff --git a/Solver/SElement.cpp b/Solver/SElement.cpp
index 32a4505bbbb50bb0da7e288fd644ba2dc6c085c7..5be09e28caa4838ced90e3540ede972df0cb2372 100644
--- a/Solver/SElement.cpp
+++ b/Solver/SElement.cpp
@@ -1,5 +1,22 @@
 #include "SElement.h"
 
+// FIXME: this will change in the future (the base SElement should no
+// contain anything except the MElement). More advanced solvers will
+// derive and/or add containers for additional storage
+
+/*
+class SFunctionSpace{
+
+}
+
+class SFunctionSpaceXFEM : class SFunctionSpace{
+
+}
+
+etc.
+
+ */
+
 simpleFunction<double> * SElement::_enrichement_s = 0,* SElement::_enrichement_t = 0;
 
 void SElement::gradNodalFunctions ( double u, double v, double w, double invjac[3][3],double Grads[][3],
diff --git a/Solver/SElement.h b/Solver/SElement.h
index 518800fefac80ef95aa0130cefc28d50b477ec8c..d921d4ff5e350580f98e39c8f1342577f14a2d83 100644
--- a/Solver/SElement.h
+++ b/Solver/SElement.h
@@ -11,6 +11,10 @@
 
 // A solver element.
 
+// FIXME: this will change in the future (the base SElement should no
+// contain anything except the MElement). More advanced solvers will
+// derive and/or add containers for additional storage
+
 class SElement
 {
  private: