diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
index 83b1b67a9..1c3f7aab6 100644
--- a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
+++ b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/data.classes
@@ -28,21 +28,74 @@
 	    "changeInspector:",
 	    "changeXYLookUp:",
 	    "clear:",
+	    "clearTexinfo:",
+	    "cloneSelection:",
+	    "decRotate:",
+	    "decXScale:",
+	    "decXShift:",
+	    "decYScale:",
+	    "decYShift:",
 	    "downFloor:",
 	    "drawMode:",
+	    "flip_x:",
+	    "flip_y:",
+	    "flip_z:",
 	    "homeView:",
+	    "incRotate:",
+	    "incXScale:",
+	    "incXShift:",
+	    "incYScale:",
+	    "incYShift:",
+	    "makeEntity:",
+	    "onlyShowMapTextures:",
 	    "openProject:",
+	    "rotate_x:",
+	    "rotate_y:",
+	    "rotate_z:",
 	    "save:",
 	    "saveAs:",
+	    "searchForTexture:",
+	    "selectCompleteEntity:",
+	    "selectCompletelyInside:",
+	    "selectPartiallyInside:",
 	    "setBrushRegion:",
+	    "setCurrentEntity:",
 	    "setModeRadio:",
 	    "setXYRegion:",
+	    "shortBrush:",
+	    "subtractSelection:",
+	    "tallBrush:",
 	    "textCommand:",
+	    "texturedefChanged:",
 	    "upFloor:",
 	    "updateAll:"
 	);
 	Super = NSObject;
     };
+    Map = {
+	Actions = (
+	    "setCurrentEntity:",
+	    "cloneSelection:",
+	    "makeEntity:",
+	    "subtractSelection:",
+	    "selectCompletelyInside:",
+	    "selectPartiallyInside:",
+	    "tallBrush:",
+	    "shortBrush:",
+	    "rotate_x:",
+	    "rotate_y:",
+	    "rotate_z:",
+	    "flip_x:",
+	    "flip_y:",
+	    "flip_z:",
+	    "selectCompleteEntity:"
+	);
+	Outlets = (
+	    currentEntity,
+	    oldselection
+	);
+	Super = NSMutableArray;
+    };
     QuakeEd = {
 	Actions = (
 	    "updateAll:",
@@ -85,6 +138,36 @@
 	);
 	Super = NSWindow;
     };
+    TexturePalette = {
+	Actions = (
+	    "searchForTexture:",
+	    "clearTexinfo:",
+	    "incXShift:",
+	    "decXShift:",
+	    "incYShift:",
+	    "decYShift:",
+	    "incRotate:",
+	    "decRotate:",
+	    "incXScale:",
+	    "decXScale:",
+	    "incYScale:",
+	    "decYScale:",
+	    "texturedefChanged:",
+	    "onlyShowMapTextures:"
+	);
+	Outlets = (
+	    textureList_i,
+	    textureView_i,
+	    searchField_i,
+	    sizeField_i,
+	    field_Xshift_i,
+	    field_Yshift_i,
+	    field_Xscale_i,
+	    field_Yscale_i,
+	    field_Rotate_i
+	);
+	Super = NSObject;
+    };
     XYView = {
 	Actions = (
 	    "setModeRadio:",
diff --git a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm
index 6bd6a4e99..aade3fc21 100644
Binary files a/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm and b/tools/Forge/Bundles/MapEdit/MapEdit.gorm/objects.gorm differ
diff --git a/tools/Forge/Bundles/MapEdit/QuakeEd.m b/tools/Forge/Bundles/MapEdit/QuakeEd.m
index e13ac474a..d0465e67b 100644
--- a/tools/Forge/Bundles/MapEdit/QuakeEd.m
+++ b/tools/Forge/Bundles/MapEdit/QuakeEd.m
@@ -348,8 +348,6 @@ App delegate methods
 	userInfo: nil repeats:YES];
 
 	path =[NSBezierPath new];
-
-	[[Map alloc] init];
 }
 
 -(void)applicationDidFinishLaunching:(NSNotification *) notification