diff --git a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
index 189f796c6a..57902866c3 100644
--- a/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
+++ b/public/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js
@@ -62,24 +62,18 @@ function updatePreview() {
     var previewFrame = document.getElementById('preview');
     var preview = previewFrame.contentDocument || previewFrame.contentWindow.document;
     preview.open();
-    preview.write(libraryIncludes + editor.getValue());
+    preview.write(libraryIncludes + editor.getValue() + otherTestsForNow);
     preview.close();
 }
 setTimeout(updatePreview, 300);
 
 /**
- * Window postMessage receiving funtionality
+ * "post" methods
  */
-var eventMethod = window.addEventListener ? "addEventListener" : "attachEvent";
-var eventer = window[eventMethod];
-var messageEvent = eventMethod == "attachEvent" ? "onmessage" : "message";
 
-// Listen to message from child window
-eventer(messageEvent,function(e) {
-    if (e.data === 'CompleteAwesomeSauce') {
-        showCompletion();
-    }
-},false);
+var postSuccess = function() {
+    showCompletion();
+};
 
 var postError = function(data) {
     console.log(Object.keys(data));
@@ -128,7 +122,6 @@ function showCompletion() {
     ga('send', 'event',  'Challenge', 'solved', challengeName + ', Time: ' + time);
     $('#next-courseware-button').removeAttr('disabled');
     $('#next-courseware-button').addClass('animated tada');
-    console.log(!userLoggedIn);
     if (!userLoggedIn) {
         $('#complete-courseware-dialog').modal('show');
     }
diff --git a/public/js/lib/coursewares/iFrameScripts.js b/public/js/lib/coursewares/iFrameScripts.js
index 5c3d38998f..0f48528f6f 100644
--- a/public/js/lib/coursewares/iFrameScripts.js
+++ b/public/js/lib/coursewares/iFrameScripts.js
@@ -8,11 +8,14 @@
         try {
             eval(tests[i]);
         } catch (err) {
-            parent.postError(err);
             allTestsGood = false;
+            console.log('All tests are good?', allTestsGood);
+            parent.postError(err);
+
         } finally {
             if (allTestsGood) {
-                parent.postMessage('CompleteAwesomeSauce', parent.nodeEnv);
+                console.log('You should not be able to see me if there are errors on teh screen!', allTestsGood);
+                parent.postSuccess();
             }
         }
     }
diff --git a/views/coursewares/showHTML.jade b/views/coursewares/showHTML.jade
index 0cd9ce5244..e4835ecce2 100644
--- a/views/coursewares/showHTML.jade
+++ b/views/coursewares/showHTML.jade
@@ -71,7 +71,6 @@ block content
                 form.code
                     .form-group.codeMirrorView
                         textarea#codeEditor(autofocus=true)
-                script(src='/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js')
         .col-md-4.col-lg-3
             .hidden-xs.hidden-sm
                 img.iphone-position(src="https://s3.amazonaws.com/freecodecamp/iphone6-frame.png")
@@ -88,4 +87,8 @@ block content
                         .text-center
                             .animated.zoomInDown.delay-half
                                 span.completion-icon.ion-checkmark-circled.text-primary
-                            a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
\ No newline at end of file
+                            a.animated.fadeIn.btn.btn-lg.signup-btn.btn-block(href='/login') Sign in so you can save your progress
+    script.
+        $(document).ready(function() {
+            script(src='/js/lib/coursewares/coursewaresHCJQFramework_v0.1.1.js')
+        });
\ No newline at end of file