3 files changed, 8 insertions, 1 deletions

diff --git a/js/document/templates/app/main.js b/js/document/templates/app/main.js
index 0cdf718c..bb4cd829 100644
--- a/js/document/templates/app/main.js
+++ b/js/document/templates/app/main.js
@@ -61,6 +61,7 @@ exports.Main = Montage.create(Component, {
                         var componentRequire = component[data.name];
                         var componentInstance = componentRequire.create();
 
+                        componentInstance._montage_metadata.label = componentInstance.identifier = data.name;
                         componentInstance.element = element;
 
                         componentInstance.needsDraw = true;
diff --git a/js/document/templates/html/index.html b/js/document/templates/html/index.html
index 8fc0d82f..bee2e557 100755
--- a/js/document/templates/html/index.html
+++ b/js/document/templates/html/index.html
@@ -113,7 +113,10 @@
         <script type="text/montage-serialization" data-ninja-template="true">
         {
             "owner": {
-                "prototype": "main"
+                "prototype": "main",
+                "properties": {
+                    "identifier": "testOwner"
+                }
             }
         }
         </script>
diff --git a/js/document/views/design.js b/js/document/views/design.js
index 1a5b071e..dad6de8b 100755
--- a/js/document/views/design.js
+++ b/js/document/views/design.js
@@ -442,15 +442,18 @@ exports.DesignDocumentView = Montage.create(BaseDocumentView, {
         value: function (scripttags) {
             var self = this;
                 //
+            //debugger;
                 this.iframe.contentWindow.document.body.addEventListener('mjsTemplateReady', function () {
                         //Initializing template with user's seriliazation
                         var template = this.iframe.contentWindow.mjsTemplate.create();
+
                         template.initWithDocument(this.iframe.contentWindow.document);
                         template.instantiateWithOwnerAndDocument(null, this.iframe.contentWindow.document, function (){
                                 //TODO: Verify this is properly done, seems like a hack
                                 for (var c in template._deserializer._objects) {
                                         //Forcing draw on components
                                         template._deserializer._objects[c].needsDraw = true;
+                                                //this.model.objects = template.deserializer.getObjectsFromLastDeserialization();
                                 }
 
                     // Now call the view callback