2 files changed, 14 insertions, 4 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index d4db6e2f..be1f89e2 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -905,7 +905,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 }
                         }
                 }
-                        return {mode: 'html', document: this._userDocument, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        return {mode: 'html', document: this._userDocument, mjs: this._userComponents, webgl: this.glData, styles: styles, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
                 } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
                 } else {
@@ -928,7 +928,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                                 }
                         }
                 }
-                        return {mode: 'html', document: this._userDocument, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
+                        return {mode: 'html', document: this._userDocument, mjs: this._userComponents, webgl: this.glData, css: css, head: this._templateDocument.head.innerHTML, body: this._templateDocument.body.innerHTML};
                 } else if (this.currentView === "code"){
                         //TODO: Would this get call when we are in code of HTML?
                 } else {
diff --git a/js/document/templates/montage-html/main.reel/main.js b/js/document/templates/montage-html/main.reel/main.js
index 6c141108..2970f37a 100644
--- a/js/document/templates/montage-html/main.reel/main.js
+++ b/js/document/templates/montage-html/main.reel/main.js
@@ -27,16 +27,17 @@ exports.Main = Montage.create(Component, {
                         var componentInstance = componentRequire.create();
 
                         componentInstance.element = element;
-                        //componentInstance.deserializedFromTemplate();
+
                         componentInstance.needsDraw = true;
                         componentInstance.ownerComponent = self;
 
+                        componentInstance.addEventListener("firstDraw", self, false);
+
                         callback(componentInstance, element);
                     })
                     .end();
 
             };
-//            window.addBinding = this.addBindingToUserDocument;
 
             // Dispatch event when this template has loaded.
             var newEvent = document.createEvent( "CustomEvent" );
@@ -45,5 +46,14 @@ exports.Main = Montage.create(Component, {
             document.body.dispatchEvent( newEvent );
 
         }
+    },
+
+    handleFirstDraw: {
+        value: function() {
+            var newEvent = document.createEvent( "CustomEvent" );
+            newEvent.initCustomEvent( "addComponentFirstDraw", false, true );
+
+            document.body.dispatchEvent( newEvent );
+        }
     }
 });
\ No newline at end of file