18 files changed, 608 insertions, 400 deletions

diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 1516a8ce..a2070471 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -33,17 +33,17 @@
                     },
                     "name": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.name",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.file.name",
                         "oneway": true
                     },
                     "saveFlag": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.needsSave",
                         "oneway": true
                     },
                     "active": {
                         "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.isActive",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.model.isActive",
                         "oneway": true
                     }
                 }
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 7795a74d..bb0f542f 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -366,7 +366,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
                                 case 'html':
                                         //Open in designer view
                     this._hackRootFlag = false;
-                    Montage.create(Document).init(doc, this, this._onOpenDocument);
+                    Montage.create(Document).init(doc, this, this._onOpenDocument, 'design');
                                         break;
                                 default:
                                         //Open in code view
diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 5665b09c..2bd774f5 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -152,7 +152,6 @@ exports.SelectionController = Montage.create(Component, {
 
     selectElement: {
         value: function(element) {
-
             if(this.findSelectedElement(element) === -1) {
 
                 if(this.application.ninja.currentDocument.inExclusion(element) !== -1){
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 9e8bf945..1cde3e8d 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -22,13 +22,13 @@ exports.MenuData = Montage.create( Montage, {
                             "displayText" : "New File",
                             "hasSubMenu" : false,
                             "enabled": true,
-                            "action":   "executeNewFile"
+                            "action":   "executeNewWebpage"
                         },
                         {
                             "displayText" : "Open File",
                             "hasSubMenu" : false,
                             "enabled": true,
-                            "action": "executeFileOpen"
+                            "action": "executeWebpageOpen"
                         },
                         {
                             "displayText" : "Close File",
@@ -130,18 +130,6 @@ exports.MenuData = Montage.create( Montage, {
                         {
                             "displayText" : "",
                             "separator":    true
-                        },
-                        {
-                            "displayText" : "New Webpage",
-                            "hasSubMenu" : false,
-                            "enabled": true,
-                            "action":   "executeNewWebpage"
-                        },
-                        {
-                            "displayText" : "Open Webpage",
-                            "hasSubMenu" : false,
-                            "enabled": true,
-                            "action": "executeWebpageOpen"
                         }
                     ]
                 },
diff --git a/js/document/document-html.js b/js/document/document-html.js
index 89717dd6..deca9f83 100755
--- a/js/document/document-html.js
+++ b/js/document/document-html.js
@@ -7,360 +7,118 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =           require("montage/core/core").Montage,
-        Component =         require("montage/ui/component").Component;
-    HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel;
+        Component =         require("montage/ui/component").Component,
+    HtmlDocumentModel = require("js/document/models/html").HtmlDocumentModel,
+    DesignDocumentView = require("js/document/views/design").DesignDocumentView;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.HtmlDocument = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
     },
-
+    ////////////////////////////////////////////////////////////////////
+        //
     model: {
         value: null
     },
-
-    loadDelegate: {
-        value: null
+        ////////////////////////////////////////////////////////////////////
+        //
+    loaded: {
+        value: {callback: null, context: null}
     },
-
-    delegateContext: {
+    ////////////////////////////////////////////////////////////////////
+        //
+    _observer: {
         value: null
     },
-
-    exclusionList: {
-        value: ["HTML", "BODY"]
-    },
-
-    // Getters for the model.
-    // TODO: Change how these properties are accessed through Ninja
-    name: {
-        get: function() {
-            return this.model._name;
-        },
-        set: function(value) {
-            this.model._name = value;
-        }
-    },
-
-    isActive: {
-        get: function() {
-            return this.model._isActive;
-        },
-        set: function(value) {
-            this.model._isActive = value;
-        }
-    },
-
-    needsSave: {
-        get: function() {
-            return this.model._needsSave;
-        },
-        set: function(value) {
-            this.model._needsSave = value;
-        }
+    ////////////////////////////////////////////////////////////////////
+        //
+    _document: {
+        value: null //TODO: Figure out if this will be needed, probably not
     },
-
-    // View Properties
-    // TODO: Move those into a view object - for now dump it here
-    iframe: {
-        value: null
+        ////////////////////////////////////////////////////////////////////
+        //
+    exclusionList: {
+        value: [] //TODO: Update to correct list
     },
-
+        ////////////////////////////////////////////////////////////////////
+        //
     uuid: {
         get: function() {
             return this._uuid;
         }
     },
-
-    currentView: {
-        value: "design"
-    },
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+        //