@@ -27,7 +27,7 @@ angular.module('javascriptcom').directive('jsConsole', ['CSConsole', 'jsCommand'
       }
 
       // Todo: Figure out how to make this work as a one time init
-      var command = new jsCommand(onSuccess, onFailure, ctrl.messages);
+      var command = new jsCommand(onSuccess, onFailure);
 
       jsChallengeProgress.console = new CSConsole(el, {
         prompt: '> ',
 
@@ -10,7 +10,6 @@ angular.module('javascriptcom').directive('jsCourse', ['_', 'jsCourseChallengeRe
     controller: function jsCourseDirective(jsCourseChallengeResource, jsChallengeProgress) {
       this.challengeProgress = jsChallengeProgress;
       this.challenges        = jsCourseChallengeResource.query({ course: this.course });
-      this.messages = [];
 
       this.challengeProgress.setChallenges(this.challenges);
 
 
@@ -1,17 +1,11 @@
 angular.module('javascriptcom').factory('jsCommand', ['_', 'jsCommandFactory', 'jsChallengeProgress', function(_, jsCommandFactory, jsChallengeProgress) {
-  return function jsCommand(successCallback, errorCallback, messages) {
+  return function jsCommand(successCallback, errorCallback) {
     var vm = this;
-    vm.messages  = messages;
 
-    function setErrorMessageType(message, fallback) {
-      message = _.isArray(message) ? message[1].content.textContent : message;
-
-      return message.match(/syntax error/i) ? 'error' : 'default';
-    }
-
-    function formatResponse(content, vm, report, type) {
-      vm.messages.push({ value: _.isArray(content) ? content[1].content.textContent : content, type: !type ? setErrorMessageType(content) : type })
-      report({ content: _.isArray(content) ? content[0].content : '' });
+    function jsReportAdapter(content) {
+      if(_.isArray(content)) { return content; }
+      if(_.isObject(content) && content['content']) { return [content]; }
+      return [{ content: content }];
     }
 
     vm.handler = function parseCommand(line, report) {
@@ -20,10 +14,10 @@ angular.module('javascriptcom').factory('jsCommand', ['_', 'jsCommandFactory', '
       var challenge = jsChallengeProgress.activeChallenge();
 
       command(challenge, line).then(function(content) {
-        formatResponse(content, vm, report, 'success')
+        report(jsReportAdapter(content));
         successCallback(challenge);
       }, function(content) {
-        formatResponse(content, vm, report)
+        report(jsReportAdapter(content));
         errorCallback(challenge);
       });
     }
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ angular.module('javascriptcom').directive('jsConsole', ['CSConsole', 'jsCommand'`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// Todo: Figure out how to make this work as a one time init`
`30`		`- var command = new jsCommand(onSuccess, onFailure, ctrl.messages);`
	`30`	`+ var command = new jsCommand(onSuccess, onFailure);`
`31`	`31`
`32`	`32`	`jsChallengeProgress.console = new CSConsole(el, {`
`33`	`33`	`prompt: '> ',`