diff --git a/src/proc/control/command-def.hpp b/src/proc/control/command-def.hpp
index acd3d71ce..54a3034d6 100644
--- a/src/proc/control/command-def.hpp
+++ b/src/proc/control/command-def.hpp
@@ -159,7 +159,7 @@ namespace control {
           BasicDefinition(function<SIG>& operation)
             {
               cout << showSizeof(operation) << endl;
-              UNIMPLEMENTED ("create new command object an store the operation functor");
+              UNIMPLEMENTED ("create new command object and store the operation functor");
             }
           
           
diff --git a/src/proc/control/command-registry.hpp b/src/proc/control/command-registry.hpp
new file mode 100644
index 000000000..1b398c0f2
--- /dev/null
+++ b/src/proc/control/command-registry.hpp
@@ -0,0 +1,74 @@
+/*
+  COMMAND-REGISTRY.hpp  -  proc-Command object registration and storage management 
+ 
+  Copyright (C)         Lumiera.org
+    2009,               Hermann Vosseler <Ichthyostega@web.de>
+ 
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+ 
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+ 
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+*/
+
+
+/** @file command-registry.hpp
+ ** Managing command definitions and the storage of individual command objects.
+ ** @todo WIP WIP.
+ ** 
+ ** \par Lifecycle
+ ** 
+ ** @see Command
+ ** @see ProcDispatcher
+ **
+ */
+
+
+
+#ifndef CONTROL_COMMAND_REGISTRY_H
+#define CONTROL_COMMAND_REGISTRY_H
+
+//#include "pre.hpp"
+#include "lib/error.hpp"
+//#include "lib/bool-checkable.hpp"
+//#include "proc/control/command-closure.hpp"
+//#include "proc/control/memento-tie.hpp"
+
+//#include <iostream>
+//#include <string>
+
+
+
+namespace control {
+  
+//  using std::ostream;
+//  using std::string;
+  
+  
+  
+  
+  /**
+   * TODO type comment
+   */
+  class CommandRegistry
+    {
+      
+    public:
+    };
+  
+  
+//  inline ostream& operator<< (ostream& os, Mutation const& muta) { return os << string(muta); }
+  
+  
+  
+} // namespace control
+#endif
diff --git a/src/proc/control/command.cpp b/src/proc/control/command.cpp
index 2138ae18c..44ed430c4 100644
--- a/src/proc/control/command.cpp
+++ b/src/proc/control/command.cpp
@@ -25,11 +25,13 @@
  ** //TODO 
  ** 
  ** @see command.hpp
+ ** @see command-registry.hpp
  **
  */
 
 
 #include "proc/control/command.hpp"
+#include "proc/control/command-registry.hpp"
 //#include "proc/mobject/mobject-ref.hpp"
 //#include "proc/mobject/mobject.hpp"
 //#include "proc/mobject/placement.hpp"
diff --git a/tests/components/proc/control/command-basic-test.cpp b/tests/components/proc/control/command-basic-test.cpp
index f7d0bacf1..ef685f833 100644
--- a/tests/components/proc/control/command-basic-test.cpp
+++ b/tests/components/proc/control/command-basic-test.cpp
@@ -137,6 +137,7 @@ namespace test    {
           
           
           Command& ourCmd = Command::get("test.command1");
+          ////////////////////////////////////////////////////////////////////TODO: isn't this unlogical? Do I want a *definition* or an *instance* ??
           
           // invoke the command
           ASSERT (*obj == Time(5));