--- a/mde/imde.d	Wed Jan 21 13:01:40 2009 +0000
+++ b/mde/imde.d	Fri Jan 23 14:59:05 2009 +0000
@@ -13,33 +13,22 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
-/** This module is for interfacing with the mde.mde module (or other module containing main()) and
- * some global items. */
+/******************************************************************************
+ *  This module is for interfacing with the mde.mde module (or other module
+ *  containing main()) and contains some global references.
+ *****************************************************************************/
 module mde.imde;
 
-import mde.input.Input;
 import mde.scheduler.Scheduler;
 import mde.content.miscContent;
 
 static this () {
-    // Make these available to all importing modules' static CTORs, as well as during init.
-    input = new Input();
+    // Make available to all importing modules:
     mainSchedule = new Scheduler;
-    
-    quit = new EventContent("quit");
-    quit.addCallback ((Content){
-	run = false;
-    });
-    menu = new ContentList ("menu",[cast(Content) quit,
-                            new EventContent("a"),
-                            new ContentList("subMenu",[
-                                           new EventContent("b"),
-                                           new EventContent("c")])
-                            ]);
+    menus = new ContentList ("menu");
 }
 
-ContentList menu;	/// Root menu for imde
-EventContent quit;	/// A content triggering mde to halt
+ContentList menus;	/// Root of all menus; import mde.menus to add entries
 
 Scheduler mainSchedule; /// The schedule used by the main loop.
 
@@ -49,5 +38,3 @@
 };
 
 bool run = true;	// main loop continues if this is true
-
-Input input;		// Input instance. When multiple users are allowed instances will be per-user.