diff --git a/FunctionSpace/BasisTest.cpp b/FunctionSpace/BasisTest.cpp
index 1080b784182c49356179323ff80fefe9e1b7a7b9..eafa8a83e89f14727bfd4fff7529ebc7c62e28bc 100644
--- a/FunctionSpace/BasisTest.cpp
+++ b/FunctionSpace/BasisTest.cpp
@@ -15,8 +15,8 @@
 #include "PlotBasis.h"
 
 using namespace std;
-/*
-int main(int argc, char** argv){
+
+int test(int argc, char** argv){
   // Init Gmsh //
   GmshInitialize(argc, argv);
 
@@ -24,7 +24,7 @@ int main(int argc, char** argv){
   Mesh msh(argv[1]);
 
   // Plot Basis //
-  QuadEdgeBasis b(1);
+  HexEdgeBasis b(1);
   
   PlotBasis plot(msh.getGroup(2), b);
   plot.write("basis");
@@ -34,4 +34,4 @@ int main(int argc, char** argv){
   
   return 0;
 }
-*/
+
diff --git a/FunctionSpace/FunctionSpace.h b/FunctionSpace/FunctionSpace.h
index 50ba5165e84eadd93f03ca87b646efc32424693e..df53bd51b2abf8933f23791cdcf9ffde98f69bd3 100644
--- a/FunctionSpace/FunctionSpace.h
+++ b/FunctionSpace/FunctionSpace.h
@@ -11,7 +11,9 @@
     
     This class represents a Function Space
 
-    @todo Hybrid Mesh
+    @todo 
+    Hybrid Mesh@n
+    Put DofManager::dofFromElement here ??
 */
 
 class FunctionSpace{