diff --git a/runestone/activecode/activecode.py b/runestone/activecode/activecode.py
index 987bbbf77..42b38c10d 100644
--- a/runestone/activecode/activecode.py
+++ b/runestone/activecode/activecode.py
@@ -47,6 +47,7 @@ def setup(app):
     app.add_javascript('skulpt.min.js')
     app.add_javascript('skulpt-stdlib.js')
     app.add_javascript('clike.js')
+    app.add_javascript('timed_activecode.js')
 
     app.add_node(ActivcodeNode, html=(visit_ac_node, depart_ac_node))
 
diff --git a/runestone/activecode/css/activecode.css b/runestone/activecode/css/activecode.css
index 7fbb6a54e..84b419e38 100644
--- a/runestone/activecode/css/activecode.css
+++ b/runestone/activecode/css/activecode.css
@@ -94,4 +94,8 @@
 
 .full_width ol {
 	max-width: 100% !important;
-}
\ No newline at end of file
+}
+
+.ac-disabled {
+	pointer-events: none;
+}
diff --git a/runestone/activecode/js/activecode.js b/runestone/activecode/js/activecode.js
index 8bf4d0b72..8458e650f 100755
--- a/runestone/activecode/js/activecode.js
+++ b/runestone/activecode/js/activecode.js
@@ -64,24 +64,24 @@ ActiveCode.prototype.init = function(opts) {
 };
 
 ActiveCode.prototype.createEditor = function (index) {
-    var newdiv = document.createElement('div');
+    this.containerDiv = document.createElement('div');
     var linkdiv = document.createElement('div')
     linkdiv.id = this.divid.replace(/_/g,'-').toLowerCase();  // :ref: changes _ to - so add this as a target
-    $(newdiv).addClass("ac_section alert alert-warning");
+    $(this.containerDiv).addClass("ac_section alert alert-warning");
     var codeDiv = document.createElement("div");
     $(codeDiv).addClass("ac_code_div col-md-12");
     this.codeDiv = codeDiv;
-    newdiv.id = this.divid;
-    newdiv.lang = this.language;
-    this.outerDiv = newdiv;
+    this.containerDiv.id = this.divid;
+    this.containerDiv.lang = this.language;
+    this.outerDiv = this.containerDiv;
 
-    $(this.origElem).replaceWith(newdiv);
+    $(this.origElem).replaceWith(this.containerDiv);
     if (linkdiv.id !== this.divid) {  // Don't want the 'extra' target if they match.
-        newdiv.appendChild(linkdiv);
+        this.containerDiv.appendChild(linkdiv);
     }
-    newdiv.appendChild(codeDiv);
+    this.containerDiv.appendChild(codeDiv);
     var editor = CodeMirror(codeDiv, {value: this.code, lineNumbers: true,
-        mode: newdiv.lang, indentUnit: 4,
+        mode: this.containerDiv.lang, indentUnit: 4,
         matchBrackets: true, autoMatchParens: true,
         extraKeys: {"Tab": "indentMore", "Shift-Tab": "indentLess"}
     });
@@ -203,6 +203,7 @@ ActiveCode.prototype.createControls = function () {
         $(butt).click((function() {new AudioTour(this.divid, this.editor.getValue(), 1, $(this.origElem).data("audio"))}).bind(this));
     }
 
+
     $(this.outerDiv).prepend(ctrlDiv);
 
 };
@@ -326,11 +327,9 @@ ActiveCode.prototype.saveEditor = function () {
 };
 
 ActiveCode.prototype.loadEditor = function () {
-
     var loadEditor = (function (data, status, whatever) {
         // function called when contents of database are returned successfully
         var res = eval(data)[0];
-
         if (res.source) {
             this.editor.setValue(res.source);
             setTimeout(function() {
@@ -356,8 +355,12 @@ ActiveCode.prototype.loadEditor = function () {
     if (this.sid !== undefined) {
         data['sid'] = this.sid;
     }
+    // This function needs to be chainable for when we want to do things like run the activecode
+    // immediately after loading the previous input (such as in a timed exam)
+    var dfd = jQuery.Deferred();
     this.logBookEvent({'event': 'activecode', 'act': 'load', 'div_id': this.divid}); // Log the run event
-    jQuery.get(eBookConfig.ajaxURL + 'getprog', data, loadEditor);
+    jQuery.get(eBookConfig.ajaxURL + 'getprog', data, loadEditor).done(function () {dfd.resolve();});
+    return dfd;
 
 };
 
@@ -731,7 +734,7 @@ JSActiveCode.prototype.runProg = function() {
         if (!str) str="";
         _this.output.innerHTML += _this.outputfun(str)+"<br />";
             };
-    
+
     $(this.eContainer).remove();
     $(this.output).text('');
     $(this.codeDiv).switchClass("col-md-12","col-md-6",{duration:500,queue:false});
@@ -1001,8 +1004,8 @@ AudioTour.prototype.tour = function (divid, audio_type, bcount) {
         // str+="<audio id="+akey+" preload='auto'><source src='http://ice-web.cc.gatech.edu/ce21/audio/"+
         // akey+".mp3' type='audio/mpeg'><source src='http://ice-web.cc.gatech.edu/ce21/audio/"+akey+
         // ".ogg' type='audio/ogg'>Your browser does not support the audio tag</audio>";
-        
-        var dir = "http://media.interactivepython.org/" + eBookConfig.basecourse + "/audio/" 
+
+        var dir = "http://media.interactivepython.org/" + eBookConfig.basecourse + "/audio/"
         //var dir = "../_static/audio/"
         str += "<audio id=" + akey + " preload='auto' >";
         str += "<source src='" + dir + akey + ".wav' type='audio/wav'>";
@@ -1595,7 +1598,9 @@ ACFactory.toggleScratchActivecode = function () {
 $(document).ready(function() {
     ACFactory.createScratchActivecode();
     $('[data-component=activecode]').each( function(index ) {
-        edList[this.id] = ACFactory.createActiveCode(this, $(this).data('lang'));
+        if ($(this.parentNode).data("component") !== "timedAssessment") {   // If this element exists within a timed component, don't render it here
+            edList[this.id] = ACFactory.createActiveCode(this, $(this).data('lang'));
+        }
     });
     if (loggedout) {
         for (k in edList) {
diff --git a/runestone/activecode/js/timed_activecode.js b/runestone/activecode/js/timed_activecode.js
new file mode 100644
index 000000000..08e454095
--- /dev/null
+++ b/runestone/activecode/js/timed_activecode.js
@@ -0,0 +1,57 @@
+function TimedActiveCode (opts) {
+    if (opts) {
+        this.timedInit(opts);
+    }
+}
+TimedActiveCode.prototype = new ActiveCode();
+
+TimedActiveCode.prototype.timedInit = function (opts) {
+    this.init(opts);
+    this.renderTimedIcon(this.containerDiv);
+    this.hideButtons();
+};
+
+
+TimedActiveCode.prototype.hideButtons = function () {
+    var buttonList = [this.saveButton, this.loadButton, this.gradeButton, this.showHideButt, this.clButton, this.coachButton, this.atButton];
+    for (var i = 0; i < buttonList.length; i++) {
+        if (buttonList[i] !== undefined && buttonList[i] !== null)
+            $(buttonList[i]).hide();
+    }
+};
+
+TimedActiveCode.prototype.renderTimedIcon = function (component) {
+    // renders the clock icon on timed components.    The component parameter
+    // is the element that the icon should be appended to.
+    var timeIconDiv = document.createElement("div");
+    var timeIcon = document.createElement("img");
+    $(timeIcon).attr({
+        "src": "../_static/clock.png",
+        "style": "width:15px;height:15px"
+    });
+    timeIconDiv.className = "timeTip";
+    timeIconDiv.title = "";
+    timeIconDiv.appendChild(timeIcon);
+    $(component).prepend(timeIconDiv);
+};
+
+TimedActiveCode.prototype.checkCorrectTimed = function () {
+    return "I";   // we ignore this in the grading
+};
+
+TimedActiveCode.prototype.hideFeedback = function () {
+    // no feedback to hide
+};
+
+TimedActiveCode.prototype.processTimedSubmission = function (logFlag) {
+    // Disable input & evaluate component
+    if (this.useRunestoneServices) {
+        if (logFlag) {
+            this.saveEditor();
+        } else {
+            this.loadEditor().done(this.runProg.bind(this));
+        }
+    }
+    this.runButton.disabled = true;
+    $(this.codeDiv).addClass("ac-disabled");
+};
diff --git a/runestone/assess/js/fitb.js b/runestone/assess/js/fitb.js
index 41640494a..86ae5bcae 100644
--- a/runestone/assess/js/fitb.js
+++ b/runestone/assess/js/fitb.js
@@ -11,26 +11,6 @@
 ===                6/4/15                ===
 ==========================================*/
 
-/*=======================================
-===         Global functions          ===
-=== (used by more than one component) ===
-=======================================*/
-
-var feedBack = function (elem, correct, feedbackText) {        // Displays feedback on page--miscellaneous function that can be used by multple objects
-    // elem is the Element in which to put the feedback
-    if (correct) {
-        $(elem).html("You are Correct!");
-        $(elem).attr("class", "alert alert-success");
-    } else {
-        if (feedbackText === null) {
-            feedbackText = "";
-        }
-        $(elem).html("Incorrect.    " + feedbackText);
-        $(elem).attr("class", "alert alert-danger");
-    }
-};
-
-
 /*==================================================
 == Begin code for the Fill In The Blank component ==
 ==================================================*/
@@ -247,7 +227,7 @@ FITB.prototype.enableCompareButton = function () {
 FITB.prototype.checkFITBStorage = function () {
     this.isCorrectArray = [];
     this.displayFeed = [];
-    // Starts chain of functions which ends with feedBack() displaying feedback to user
+    // Starts chain of functions which ends with displaying feedback to user
     this.evaluateAnswers();
     this.renderFITBFeedback();
     var answerInfo = "answer:" + this.given_arr + ":" + (this.correct ? "correct" : "no");
@@ -278,12 +258,24 @@ FITB.prototype.evaluateAnswers = function () {
     }
     if ($.inArray("", this.isCorrectArray) < 0 && $.inArray(false, this.isCorrectArray) < 0) {
         this.correct = true;
-    } else if ($.inArray(false, this.isCorrectArray) >= 0 && $.inArray("", this.isCorrectArray) < 0) {
+    } else if (this.isCompletelyBlank()) {
+        this.correct = null;
+    } else {
         this.correct = false;
     }
     localStorage.setItem(eBookConfig.email + ":" + this.divid + "-given", this.given_arr.join(";"));
 };
 
+FITB.prototype.isCompletelyBlank = function () {
+    // Returns true if the user didn't fill in any of the blanks, else false
+    for (var i = 0; i < this.isCorrectArray.length; i++) {
+        if (this.isCorrectArray[i] !== "") {
+            return false;
+        }
+    }
+    return true;
+};
+
 FITB.prototype.populateDisplayFeed = function (index, given) {
     var fbl = this.feedbackArray[index];
     for (var j = 0; j < fbl.length; j++) {
diff --git a/runestone/assess/js/timed.js b/runestone/assess/js/timed.js
index b38078b49..c17241b71 100644
--- a/runestone/assess/js/timed.js
+++ b/runestone/assess/js/timed.js
@@ -50,7 +50,7 @@ Timed.prototype.init = function (opts) {
     if ($(this.origElem).is("[data-random]")) {
         this.random = true;
     }
-    this.showTimer = true; 
+    this.showTimer = true;
     if ($(this.origElem).is("[data-no-timer]")) {
         this.showTimer = false;
     }
@@ -94,10 +94,10 @@ Timed.prototype.renderTimedAssess = function () {
     this.renderNavControls();
     this.renderSubmitButton();
     this.renderFeedbackContainer();
-	
+
     // Replace intermediate HTML with rendered HTML
     $(this.origElem).replaceWith(this.assessDiv);
-    
+
     // check if already taken and if so show results
     this.tookTimedExam();
     if (this.taken) {
@@ -121,7 +121,7 @@ Timed.prototype.renderContainer = function () {
 };
 
 Timed.prototype.renderTimer = function () {
-    this.wrapperDiv = document.createElement("div"); 
+    this.wrapperDiv = document.createElement("div");
     this.timerContainer = document.createElement("P");
     this.wrapperDiv.id = "startWrapper";
     this.timerContainer.id = "output";
@@ -181,10 +181,12 @@ Timed.prototype.renderNavControls = function () {
 	this.navDiv.appendChild(this.pagNavList);
     this.break = document.createElement("br");
     this.navDiv.appendChild(this.break);
-    
+
     // render the question number jump buttons
     this.qNumList = document.createElement("ul");
 	$(this.qNumList).attr("id", "pageNums");
+    this.qNumWrapperList = document.createElement("ul");
+    $(this.qNumWrapperList).addClass("pagination");
 	var tmpLi, tmpA;
     for (var i = 0; i < this.renderedQuestionArray.length; i++) {
 	    tmpLi = document.createElement("li");
@@ -195,18 +197,11 @@ Timed.prototype.renderNavControls = function () {
             $(tmpLi).addClass("active");
         }
         tmpLi.appendChild(tmpA);
-        this.qNumList.appendChild(tmpLi);	
+        this.qNumWrapperList.appendChild(tmpLi);
     }
+    this.qNumList.appendChild(this.qNumWrapperList);
     this.navDiv.appendChild(this.qNumList);
-	this.navBtnListeners();  
-	
-	$(function(){
-		var tenSet = $("ul#pageNums li");
-		for (var i = 0; i < tenSet.length; i += 10) {
-			tenSet.slice(i, i + 10).wrapAll("<ul class=\"pagination\"></ul>");
-		}
-	});
-	
+	this.navBtnListeners();
 };
 
 Timed.prototype.navBtnListeners = function() {
@@ -214,18 +209,18 @@ Timed.prototype.navBtnListeners = function() {
 	this.pagNavList.addEventListener("click", function (event) {
 		if ($("div#timed_Test form input[name='group1']").is(":checked")) {
 			$("ul#pageNums > ul > li:eq(" + this.currentQuestionIndex +")").addClass("answered");
-		}	
+		}
 		var target = $(event.target).text();
 		if (target.match(/Next/)) {
 			if ($(this.rightContainer).hasClass("disabled")) {
-				return; 
-			} 
+				return;
+			}
 			this.currentQuestionIndex++;
-		} 
+		}
 		else if (target.match(/Prev/)) {
 			if ($(this.leftContainer).hasClass("disabled")) {
 				return;
-			} 
+			}
 			this.currentQuestionIndex--;
 		}
 		this.renderTimedQuestion();
@@ -245,7 +240,7 @@ Timed.prototype.navBtnListeners = function() {
 		}
 		for (var i = 0; i < this.qNumList.childNodes.length; i++) {
 			for (var j = 0; j < this.qNumList.childNodes[i].childNodes.length; j++) {
-				$(this.qNumList.childNodes[i].childNodes[j]).removeClass("active"); 
+				$(this.qNumList.childNodes[i].childNodes[j]).removeClass("active");
 			}
 		}
 		var target = $(event.target).text();
@@ -254,7 +249,7 @@ Timed.prototype.navBtnListeners = function() {
 		this.renderTimedQuestion();
 		this.ensureButtonSafety();
 	}.bind(this), false);
-	
+
 };
 
 Timed.prototype.renderSubmitButton = function () {
@@ -315,6 +310,12 @@ Timed.prototype.createRenderedQuestionArray = function () {
             this.renderedQuestionArray.push(new TimedDragNDrop(opts));
         } else if ($(tmpChild).is("[data-component=clickablearea]")) {
             this.renderedQuestionArray.push(new TimedClickableArea(opts));
+        } else if ($(tmpChild).is("[data-component=shortanswer]")) {
+            this.renderedQuestionArray.push(new TimedShortAnswer(opts));
+        } else if ($(tmpChild).is("[data-component=parsons]")) {
+            this.renderedQuestionArray.push(new TimedParsons(opts));
+        } else if ($(tmpChild).is("[data-component=activecode]")) {
+            this.renderedQuestionArray.push(new TimedActiveCode(opts));
         }
     }
     if (this.random) {
@@ -358,7 +359,7 @@ Timed.prototype.handlePrevAssessment = function () {
         } else {
            $(this.pauseBtn).hide();
         }
-}
+};
 
 Timed.prototype.startAssessment = function () {
     this.tookTimedExam();
@@ -501,7 +502,6 @@ Timed.prototype.tookTimedExam = function () {
         "background-color": "black",
         "color": "white"
     });
-
     var len = localStorage.length;
     if (len > 0) {
         if (localStorage.getItem(eBookConfig.email + ":" + this.divid) !== null) {
@@ -529,7 +529,7 @@ Timed.prototype.finishAssessment = function () {
         this.logScore();
         $(this.pauseBtn).attr("disabled", true);
         this.finishButton.disabled = true;
-        
+
         if (!this.showResults) {
            $(this.timedDiv).hide();
            $(this.pauseBtn).hide();
@@ -557,19 +557,21 @@ Timed.prototype.checkScore = function () {
     this.skippedStr = "";
     this.incorrectStr = "";
     // Gets the score of each problem
+
     for (var i = 0; i < this.renderedQuestionArray.length; i++) {
         var correct = this.renderedQuestionArray[i].checkCorrectTimed();
-        if (correct) {
-		    this.score++;
-			this.correctStr = this.correctStr + (i + 1) + ", ";				
-			
+        if (correct == "T") {
+            this.score++;
+            this.correctStr = this.correctStr + (i + 1) + ", ";
+
+        } else if (correct == "F") {
+            this.incorrect++;
+            this.incorrectStr = this.incorrectStr + (i + 1) + ", ";
         } else if (correct === null) {
             this.skipped++;
-			this.skippedStr = this.skippedStr + (i + 1) + ", ";
-			
+            this.skippedStr = this.skippedStr + (i + 1) + ", ";
         } else {
-            this.incorrect++;
-			this.incorrectStr = this.incorrectStr + (i + 1) + ", ";
+            // ignored question; just do nothing
         }
     }
 	// remove extra comma and space at end if any
@@ -629,27 +631,27 @@ Timed.prototype.restoreFromStorage = function () {
 };
 
 Timed.prototype.displayScore = function () {
- 
+
 	if (this.showResults)
-    {   
+    {
        // if we have some information
        if (this.correctStr.length > 0 || this.incorrectStr.length > 0 || this.skippedStr.length > 0)
        {
           var scoreString = "Num Correct: " + this.score + ". Questions: " + this.correctStr + "<br>" +
           "Num Wrong: " + this.incorrect + ". Questions: " + this.incorrectStr + "<br>" +
           "Num Skipped: " + this.skipped + ". Questions: " + this.skippedStr + "<br>";
-          var numQuestions = this.renderedQuestionArray.length;
+          var numQuestions = this.score + this.incorrect + this.skipped;
           var percentCorrect = (this.score / numQuestions) * 100;
           scoreString += "Percent Correct: " + percentCorrect + "%";
           $(this.scoreDiv).html(scoreString);
           this.scoreDiv.style.display = "block";
       }
-      else 
+      else
       {
           var scoreString = "Num Correct: " + this.score + "<br>" +
           "Num Wrong: " + this.incorrect + "<br>" +
           "Num Skipped: " + this.skipped + "<br>";
-          var numQuestions = this.renderedQuestionArray.length;
+          var numQuestions = this.score + this.incorrect + this.skipped
           var percentCorrect = (this.score / numQuestions) * 100;
           scoreString += "Percent Correct: " + percentCorrect + "%";
           $(this.scoreDiv).html(scoreString);
@@ -662,7 +664,7 @@ Timed.prototype.displayScore = function () {
       this.scoreDiv.style.display = "block";
    }
 };
-										
+
 Timed.prototype.highlightNumberedList = function () {
 	var correctCount = this.correctStr;
 	var	incorrectCount = this.incorrectStr;
@@ -671,31 +673,31 @@ Timed.prototype.highlightNumberedList = function () {
 	correctCount = correctCount.replace(/ /g,'').split(',');
 	incorrectCount = incorrectCount.replace(/ /g,'').split(',');
 	skippedCount = skippedCount.replace(/ /g,'').split(',');
-		
+
 	$(function () {		// This code is wrapped in a function so that it executes only after DOM has loaded
 		var numberedBtns = $("ul#pageNums > ul > li");
 		if (numberedBtns.hasClass("answered")) {
-			numberedBtns.removeClass("answered"); 
-		}	
+			numberedBtns.removeClass("answered");
+		}
 		for (var i = 0; i < correctCount.length; i++) {
-			var test = parseInt(correctCount[i])-1; 
-			numberedBtns.eq(parseInt(correctCount[i])-1).addClass("correctCount");	
+			var test = parseInt(correctCount[i])-1;
+			numberedBtns.eq(parseInt(correctCount[i])-1).addClass("correctCount");
 		}
 		for (var j = 0; j < incorrectCount.length; j++) {
-			numberedBtns.eq(parseInt(incorrectCount[j])-1).addClass("incorrectCount");	
+			numberedBtns.eq(parseInt(incorrectCount[j])-1).addClass("incorrectCount");
 		}
 		for (var k = 0; k < skippedCount.length; k++) {
-			numberedBtns.eq(parseInt(skippedCount[k])-1).addClass("skippedCount");	
-		} 
+			numberedBtns.eq(parseInt(skippedCount[k])-1).addClass("skippedCount");
+		}
 	});
-};	
+};
 
 
 /*=======================================================
 === Function that calls the constructors on page load ===
 =======================================================*/
 
-$(document).ready(function () {
+$(document).bind("runestone:login-complete", function () {
     $("[data-component=timedAssessment]").each(function (index) {
         TimedList[this.id] = new Timed({"orig": this});
     });
diff --git a/runestone/assess/js/timedfitb.js b/runestone/assess/js/timedfitb.js
index 2ed5b04c5..664fa4826 100644
--- a/runestone/assess/js/timedfitb.js
+++ b/runestone/assess/js/timedfitb.js
@@ -34,8 +34,15 @@ TimedFITB.prototype.renderTimedIcon = function (component) {
 };
 
 TimedFITB.prototype.checkCorrectTimed = function () {
-    // Returns if the question was correct.    Used for timed assessment grading.
-    return this.correct;
+    // Returns if the question was correct, incorrect, or skipped (return null in the last case)
+    switch (this.correct) {
+        case (true):
+            return "T";
+        case (false):
+            return "F";
+        default:
+            return null;
+    }
 };
 
 TimedFITB.prototype.hideFeedback = function () {
@@ -46,6 +53,7 @@ TimedFITB.prototype.hideFeedback = function () {
 };
 
 TimedFITB.prototype.processTimedSubmission = function () {
+    // Disable input, then evaluate component
     for (var i = 0; i < this.blankArray.length; i++) {
         this.blankArray[i].disabled = true;
     }
diff --git a/runestone/assess/js/timedmc.js b/runestone/assess/js/timedmc.js
index 8a1064c4b..43b406d38 100644
--- a/runestone/assess/js/timedmc.js
+++ b/runestone/assess/js/timedmc.js
@@ -112,11 +112,26 @@ TimedMC.prototype.checkCorrectTimedMCMA = function () {
     } else if (this.givenArray.length !== 0) {
         this.correct = false;
     }
-    return this.correct;
+    switch (this.correct) {
+        case (true):
+            return "T";
+        case (false):
+            return "F";
+        default:
+            return null;
+    }
 };
 
 TimedMC.prototype.checkCorrectTimedMCMF = function () {
-    return this.correct;
+    // Returns if the question was correct, incorrect, or skipped (return null in the last case)
+    switch (this.correct) {
+        case (true):
+            return "T";
+        case (false):
+            return "F";
+        default:
+            return null;
+    }
 };
 
 TimedMC.prototype.checkCorrectTimed = function () {
@@ -134,6 +149,7 @@ TimedMC.prototype.hideFeedback = function () {
 };
 
 TimedMC.prototype.processTimedSubmission = function (logFlag) {
+    // Disable input, then evaluate component
     for (var i = 0; i < this.optionArray.length; i++) {
         this.optionArray[i]["input"].disabled = true;
     }
diff --git a/runestone/clickableArea/js/timedclickable.js b/runestone/clickableArea/js/timedclickable.js
index 286cac4d5..c652b4324 100644
--- a/runestone/clickableArea/js/timedclickable.js
+++ b/runestone/clickableArea/js/timedclickable.js
@@ -32,11 +32,18 @@ TimedClickableArea.prototype.renderTimedIcon = function (component) {
 };
 
 TimedClickableArea.prototype.checkCorrectTimed = function () {
-    // Returns if the question was correct.    Used for timed assessment grading.
+    // Returns if the question was correct, incorrect, or skipped (return null in the last case)
     if (this.correctNum === 0 && this.incorrectNum === 0) {
         this.correct = null;
     }
-    return this.correct;
+    switch (this.correct) {
+        case (true):
+            return "T";
+        case (false):
+            return "F";
+        default:
+            return null;
+    }
 };
 
 TimedClickableArea.prototype.hideFeedback = function () {
@@ -44,11 +51,12 @@ TimedClickableArea.prototype.hideFeedback = function () {
 };
 
 TimedClickableArea.prototype.processTimedSubmission = function () {
+    // Disable input, then evaluate component
     for (var i = 0; i < this.clickableArray.length; i++) {
         $(this.clickableArray[i]).css("cursor", "initial");
         this.clickableArray[i].onclick = function () {
             return;
-        }
+        };
     }
     this.clickableEval();
 };
diff --git a/runestone/common/js/bookfuncs.js b/runestone/common/js/bookfuncs.js
index add0829a9..e4fee60d8 100644
--- a/runestone/common/js/bookfuncs.js
+++ b/runestone/common/js/bookfuncs.js
@@ -27,12 +27,12 @@
 
 //
 // Chevron functions - Must correspond with width in runestone-custom-sphinx-bootstrap.css
-// 
+//
 $(function () {
 	var resizeWindow = false;
     var	resizeWidth = 600;
 	$(window).on('resize', function (event){
-		if ($(window).width() <= resizeWidth && resizeWindow == false){ 
+		if ($(window).width() <= resizeWidth && resizeWindow == false){
 			resizeWindow = true;
 			var topPrev = $("#relations-prev").clone().attr("id", "top-relations-prev");
 			var topNext = $("#relations-next").clone().attr("id", "top-relations-next");
@@ -44,15 +44,15 @@ $(function () {
 			$("div#main-content > div").append(bottomPrev, bottomNext);
 			$("#bottom-relations-prev, #bottom-relations-next").wrapAll("<ul id=\"bottom-relations-console\"></ul>");
 		}
-		if ($(window).width() >= resizeWidth + 1 && resizeWindow == true){ 
+		if ($(window).width() >= resizeWidth + 1 && resizeWindow == true){
 			resizeWindow = false;
 			$("#top-relations-console, #bottom-relations-console").remove();
 			$("#relations-prev, #relations-next").show();
 		}
 	}).resize();
-});	
- 
- 
+});
+
+
 //
 // Logging functions
 //
@@ -134,6 +134,8 @@ function gotUser(data, status, whatever) {
         'act': 'view',
         'div_id': window.location.pathname
     })
+	// Let runestone components know they can run their javascript now
+	$(document).trigger("runestone:login-complete");
 }
 
 
@@ -170,9 +172,11 @@ function isLoggedIn() {
 
 function handleLoginLogout() {
     if (shouldLogin()) {
-        jQuery.get(eBookConfig.ajaxURL + 'getuser', null, gotUser)
+        jQuery.get(eBookConfig.ajaxURL + 'getuser', null, gotUser).error(function () { $(document).trigger("runestone:login-complete"); });
     } else {
         $(document).trigger("runestone:logout")
+		// Let runestone components know they can run their javascript now
+		$(document).trigger("runestone:login-complete");
     }
 }
 
@@ -281,6 +285,8 @@ $(document).ready(function() {
         if (typeof eBookConfig === 'undefined') {
             console.log("eBookConfig is not defined.  This page must not be set up for Runestone");
         }
+		// Let runestone components know they can run their javascript now
+		$(document).trigger("runestone:login-complete");
     }
 });
 
@@ -301,4 +307,4 @@ $(document).ready(function() {
       e.stopPropagation();
       });
   });
-});
\ No newline at end of file
+});
diff --git a/runestone/dragndrop/js/timeddnd.js b/runestone/dragndrop/js/timeddnd.js
index c3cdfca2d..4ea0de2ff 100644
--- a/runestone/dragndrop/js/timeddnd.js
+++ b/runestone/dragndrop/js/timeddnd.js
@@ -36,8 +36,14 @@ TimedDragNDrop.prototype.checkCorrectTimed = function () {
     if (this.unansweredNum === this.dragPairArray.length) {
         this.correct = null;
     }
-
-    return this.correct;
+    switch (this.correct) {
+        case (true):
+            return "T";
+        case (false):
+            return "F";
+        default:
+            return null;
+    }
 };
 
 TimedDragNDrop.prototype.hideFeedback = function () {
@@ -45,6 +51,7 @@ TimedDragNDrop.prototype.hideFeedback = function () {
 };
 
 TimedDragNDrop.prototype.processTimedSubmission = function () {
+    // Disable input & evaluate component
     $(this.resetButton).hide();
     this.dragEval();
     for (var i = 0; i < this.dragPairArray.length; i++) {   // No more dragging
diff --git a/runestone/parsons/css/parsons.css b/runestone/parsons/css/parsons.css
index 7dcb5fef2..837dbd67f 100644
--- a/runestone/parsons/css/parsons.css
+++ b/runestone/parsons/css/parsons.css
@@ -135,3 +135,7 @@ li.correctPosition, .testcase.pass {
 	margin-right: auto;
 	text-align:center;
 }
+
+.parsons-disabled {
+    pointer-events: none;
+}
diff --git a/runestone/parsons/js/parsons_setup.js b/runestone/parsons/js/parsons_setup.js
index be2146a79..0ce3720f9 100644
--- a/runestone/parsons/js/parsons_setup.js
+++ b/runestone/parsons/js/parsons_setup.js
@@ -93,28 +93,28 @@ Parsons.prototype.formatCode = function () {
 == Creating/appending new HTML tags ==
 ====================================*/
 Parsons.prototype.createParsonsView = function () {         // Create DOM elements
-    this.containingDiv = document.createElement("div");
-    $(this.containingDiv).addClass("parsons alert alert-warning");
-    this.containingDiv.id = "parsons-" + this.counterId;
+    this.containerDiv = document.createElement("div");
+    $(this.containerDiv).addClass("parsons alert alert-warning");
+    this.containerDiv.id = "parsons-" + this.counterId;
 
     this.parsTextDiv = document.createElement("div");
     $(this.parsTextDiv).addClass("parsons-text");
     this.parsTextDiv.innerHTML = this.question.innerHTML;
-    this.containingDiv.appendChild(this.parsTextDiv);
+    this.containerDiv.appendChild(this.parsTextDiv);
 
     this.leftClearDiv = document.createElement("div");
     this.leftClearDiv.style["clear"] = "left";
-    this.containingDiv.appendChild(this.leftClearDiv);
+    this.containerDiv.appendChild(this.leftClearDiv);
 
     this.origDiv = document.createElement("div");
     this.origDiv.id = "parsons-orig-" + this.counterId;
     this.origDiv.style["display"] = "none";
     this.origDiv.innerHTML = this.fmtCode;
-    this.containingDiv.appendChild(this.origDiv);
+    this.containerDiv.appendChild(this.origDiv);
 
     this.sortContainerDiv = document.createElement("div");
     $(this.sortContainerDiv).addClass("sortable-code-container");
-    this.containingDiv.appendChild(this.sortContainerDiv);
+    this.containerDiv.appendChild(this.sortContainerDiv);
 
     this.sortTrashDiv = document.createElement("div");
     this.sortTrashDiv.id = "parsons-sortableTrash-" + this.counterId;
@@ -132,7 +132,7 @@ Parsons.prototype.createParsonsView = function () {         // Create DOM elemen
 
     this.parsonsControlDiv = document.createElement("div");
     $(this.parsonsControlDiv).addClass("parsons-controls");
-    this.containingDiv.appendChild(this.parsonsControlDiv);
+    this.containerDiv.appendChild(this.parsonsControlDiv);
 
     this.checkButt = document.createElement("button");
     $(this.checkButt).attr("class", "btn btn-success");
@@ -153,7 +153,7 @@ Parsons.prototype.createParsonsView = function () {         // Create DOM elemen
     this.parsonsControlDiv.appendChild(this.messageDiv);
     $(this.messageDiv).hide();
 
-    $(this.origElem).replaceWith(this.containingDiv);
+    $(this.origElem).replaceWith(this.containerDiv);
 
     this.createParsonsWidget();
 };
@@ -267,10 +267,16 @@ Parsons.prototype.tryLocalStorage = function () {
     }
 };
 
+// Will be implemented later to fix evaluation for parsons
+Parsons.prototype.reInitialize = function () {
+    // this.pwidget.reInitialize()
+    return null;
+};
+
 $(document).ready(function () {
     $pjQ("[data-component=parsons]").each(function (index) {
         if ($(this.parentNode).data("component") != "timedAssessment") {
-           prsList[this.id] = new Parsons({"orig": this});
+           prsList[this.id] = new Parsons({"orig": this, "useRunestoneServices": eBookConfig.useRunestoneServices});
         }
     });
 
diff --git a/runestone/parsons/js/timedparsons.js b/runestone/parsons/js/timedparsons.js
new file mode 100644
index 000000000..953279970
--- /dev/null
+++ b/runestone/parsons/js/timedparsons.js
@@ -0,0 +1,64 @@
+function TimedParsons (opts) {
+    if (opts) {
+        this.timedInit(opts);
+    }
+}
+
+TimedParsons.prototype = new Parsons();
+
+TimedParsons.prototype.timedInit = function (opts) {
+    this.init(opts);
+    this.renderTimedIcon(this.containerDiv);
+    this.hideButtons();
+};
+
+
+TimedParsons.prototype.hideButtons = function () {
+    $(this.checkButt).hide();
+};
+
+TimedParsons.prototype.renderTimedIcon = function (component) {
+    // renders the clock icon on timed components.    The component parameter
+    // is the element that the icon should be appended to.
+    var timeIconDiv = document.createElement("div");
+    var timeIcon = document.createElement("img");
+    $(timeIcon).attr({
+        "src": "../_static/clock.png",
+        "style": "width:15px;height:15px"
+    });
+    timeIconDiv.className = "timeTip";
+    timeIconDiv.title = "";
+    timeIconDiv.appendChild(timeIcon);
+    $(component).prepend(timeIconDiv);
+};
+
+TimedParsons.prototype.checkCorrectTimed = function () {
+    return this.correct ? "T" : "F";
+};
+
+TimedParsons.prototype.hideFeedback = function () {
+    $(this.messageDiv).hide();
+};
+
+TimedParsons.prototype.processTimedSubmission = function (logflag) {
+    // Disable input & evaluate component
+    this.reInitialize();
+    var hash = this.pwidget.getHash("#ul-parsons-sortableCode-" + this.counterId);
+    if (logflag)
+        localStorage.setItem(this.divid, hash);
+    hash = this.pwidget.getHash("#ul-parsons-sortableTrash-" + this.counterId);
+    if (logflag)
+        localStorage.setItem(this.divid + "-trash", hash);
+    this.pwidget.getFeedback();
+
+    // Gross way to check if it's correct or not, but it's better than modifying the 3rd party parsons code to include a "correct" variable
+    if ($(this.messageDiv).hasClass("alert-success")) {
+        this.correct = true;
+    } else {
+        this.correct = false;
+    }
+
+    this.resetButt.disabled = true;
+    $(this.sortContainerDiv).addClass("parsons-disabled");
+
+};
diff --git a/runestone/parsons/parsons.py b/runestone/parsons/parsons.py
index 145125097..de967ba2d 100644
--- a/runestone/parsons/parsons.py
+++ b/runestone/parsons/parsons.py
@@ -37,6 +37,7 @@ def setup(app):
     app.add_javascript('parsons_setup.js')
     app.add_javascript('parsons.js')
     app.add_javascript('parsons-noconflict.js')
+    app.add_javascript('timedparsons.js')
 
 class ParsonsProblem(Assessment):
     required_arguments = 1
@@ -88,7 +89,7 @@ def findmax(alist):
         self.options['qnumber'] = self.getNumber()
         self.options['instructions'] = ""
         self.options['code'] = self.content
-          
+
         if 'maxdist' not in self.options:
             self.options['maxdist'] = '5'
         if '-----' in self.content:
diff --git a/runestone/shortanswer/js/shortanswer.js b/runestone/shortanswer/js/shortanswer.js
index cbc452241..936462025 100644
--- a/runestone/shortanswer/js/shortanswer.js
+++ b/runestone/shortanswer/js/shortanswer.js
@@ -179,7 +179,9 @@ ShortAnswer.prototype.loadJournal = function () {
 =================================*/
 $(document).ready(function () {
     $("[data-component=shortanswer]").each(function (index) {
-        saList[this.id] = new ShortAnswer({"orig": this, 'useRunestoneServices': eBookConfig.useRunestoneServices});
+        if ($(this.parentNode).data("component") !== "timedAssessment") { // If this element exists within a timed component, don't render it here
+            saList[this.id] = new ShortAnswer({"orig": this, 'useRunestoneServices': eBookConfig.useRunestoneServices});
+        }
     });
 
 });
diff --git a/runestone/shortanswer/js/timed_shortanswer.js b/runestone/shortanswer/js/timed_shortanswer.js
new file mode 100644
index 000000000..aa1484de4
--- /dev/null
+++ b/runestone/shortanswer/js/timed_shortanswer.js
@@ -0,0 +1,47 @@
+function TimedShortAnswer (opts) {
+    if (opts) {
+        this.timedInit(opts);
+    }
+}
+TimedShortAnswer.prototype = new ShortAnswer();
+
+TimedShortAnswer.prototype.timedInit = function (opts) {
+    this.init(opts);
+    this.renderTimedIcon(this.containerDiv);
+    this.hideButtons();
+};
+
+
+TimedShortAnswer.prototype.hideButtons = function () {
+    $(this.submitButton).hide();
+
+};
+
+TimedShortAnswer.prototype.renderTimedIcon = function (component) {
+    // renders the clock icon on timed components.    The component parameter
+    // is the element that the icon should be appended to.
+    var timeIconDiv = document.createElement("div");
+    var timeIcon = document.createElement("img");
+    $(timeIcon).attr({
+        "src": "../_static/clock.png",
+        "style": "width:15px;height:15px"
+    });
+    timeIconDiv.className = "timeTip";
+    timeIconDiv.title = "";
+    timeIconDiv.appendChild(timeIcon);
+    $(component).prepend(timeIconDiv);
+};
+
+TimedShortAnswer.prototype.checkCorrectTimed = function () {
+    return "I";   // we ignore this in the grading
+};
+
+TimedShortAnswer.prototype.hideFeedback = function () {
+    $(this.feedbackDiv).hide();
+};
+
+TimedShortAnswer.prototype.processTimedSubmission = function () {
+    // Disable input & evaluate component
+    this.submitJournal();
+    this.jTextArea.disabled = true;
+};
diff --git a/runestone/shortanswer/shortanswer.py b/runestone/shortanswer/shortanswer.py
index 4b98b22f6..817b049e9 100755
--- a/runestone/shortanswer/shortanswer.py
+++ b/runestone/shortanswer/shortanswer.py
@@ -24,10 +24,9 @@
 
 def setup(app):
     app.add_directive('shortanswer', JournalDirective)
-
     app.add_node(JournalNode, html=(visit_journal_node, depart_journal_node))
-
     app.add_javascript('shortanswer.js')
+    app.add_javascript('timed_shortanswer.js')
 
 
 TEXT = """
@@ -41,13 +40,8 @@ def __init__(self, options):
 
 def visit_journal_node(self, node):
     div_id = node.journalnode_components['divid']
-    back, subchapter = os.path.split(os.path.splitext(node.source.lower())[0])
-    back, chapter = os.path.split(back)
-    content = ''
     components = dict(node.journalnode_components)
-    components.update({'divid': div_id,
-                       'subchapter': subchapter,
-                       'chapter': chapter})
+    components.update({'divid': div_id})
     res = TEXT % components
     self.body.append(res)