diff --git a/Mud Designer/Mud Designer.csproj b/Mud Designer/Mud Designer.csproj
index 624b152..18bdb76 100644
--- a/Mud Designer/Mud Designer.csproj	
+++ b/Mud Designer/Mud Designer.csproj	
@@ -93,13 +93,6 @@
     <Compile Include="MudEngine\GameManagement\ProjectInformation.cs" />
     <Compile Include="MudEngine\FileSystem\FileManager.cs" />
     <Compile Include="MudEngine\GameManagement\QuestSetup.cs" />
-    <Compile Include="MudEngine\UITypeEditors\UIDoorwayControl.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MudEngine\UITypeEditors\UIDoorwayControl.Designer.cs">
-      <DependentUpon>UIDoorwayControl.cs</DependentUpon>
-    </Compile>
-    <Compile Include="MudEngine\UITypeEditors\UIDoorwayEditor.cs" />
     <Compile Include="MudEngine\UITypeEditors\UIRealmControl.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -126,10 +119,6 @@
       <DependentUpon>Designer.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="MudEngine\UITypeEditors\UIDoorwayControl.resx">
-      <DependentUpon>UIDoorwayControl.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="MudEngine\UITypeEditors\UIRealmControl.resx">
       <DependentUpon>UIRealmControl.cs</DependentUpon>
       <SubType>Designer</SubType>
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/Door.cs b/Mud Designer/MudEngine/GameObjects/Environment/Door.cs
index 5cf4d10..d613b88 100644
--- a/Mud Designer/MudEngine/GameObjects/Environment/Door.cs	
+++ b/Mud Designer/MudEngine/GameObjects/Environment/Door.cs	
@@ -14,21 +14,6 @@ namespace MudDesigner.MudEngine.GameObjects.Environment
     [Serializable]
     public class Door
     {
-        public struct DoorwayLinkInformation
-        {
-            public string Realm;
-            public string Zone;
-            public string Room;
-
-            public override string ToString()
-            {
-                if (string.IsNullOrEmpty(Room))
-                    return "Doorway to no where.";
-                else
-                    return "Doorway to " + Room;
-            }
-        }
-
         [Category("Door Settings")]
         [DefaultValue(false)]
         public bool IsLocked
@@ -54,32 +39,27 @@ namespace MudDesigner.MudEngine.GameObjects.Environment
         }
 
         [Category("Door Settings")]
-        [EditorAttribute(typeof(UIDoorwayEditor), typeof(System.Drawing.Design.UITypeEditor))]
-        public DoorwayLinkInformation DoorwayLink
-        {
-            get;
-            set;
-        }
+        public AvailableTravelDirections TravelDirection { get; set; }
 
-        [Browsable(false)]
-        public AvailableTravelDirections TravelDirection;
+        public string ConnectedRoom { get; set; }
 
         public Door()
         {
             LevelRequirement = 0;
             IsLocked = false;
             RequiredKey = new BaseItem();
-            DoorwayLink = new DoorwayLinkInformation();
         }
 
-        public Door(DoorwayLinkInformation linkInformation) : this()
+        public Door(AvailableTravelDirections travelDirection, string connectedRoom)
+            : this()
         {
-            this.DoorwayLink = linkInformation;
+            ConnectedRoom = connectedRoom;
+            TravelDirection = travelDirection;
         }
 
         public override string ToString()
         {
-            return this.TravelDirection.ToString() + " Doorway";
+            return this.TravelDirection.ToString();
         }
     }
 }
diff --git a/Mud Designer/MudEngine/GameObjects/Environment/Room.cs b/Mud Designer/MudEngine/GameObjects/Environment/Room.cs
index 7d5e89c..359f606 100644
--- a/Mud Designer/MudEngine/GameObjects/Environment/Room.cs	
+++ b/Mud Designer/MudEngine/GameObjects/Environment/Room.cs	
@@ -36,6 +36,12 @@ namespace MudDesigner.MudEngine.GameObjects.Environment
             }
         }
 
+        public AvailableTravelDirections Directions
+        {
+            get;
+            set;
+        }
+
         [Category("Environment Information")]
         [Description("Allows for linking of Rooms together via Doorways")]
         public List<Door> Doorways
@@ -75,6 +81,7 @@ namespace MudDesigner.MudEngine.GameObjects.Environment
         public Room()
         {
             Doorways = new List<Door>();
+            
             IsSafe = false;
         }
     }