diff --git a/src/collections.js b/src/collections.js
index 1c9c20d0..7e43506c 100644
--- a/src/collections.js
+++ b/src/collections.js
@@ -2,26 +2,28 @@ var CommitCollection = Backbone.Collection.extend({
   model: Commit
 });
 
-var commitCollection = new CommitCollection();
-
 var CommandCollection = Backbone.Collection.extend({
   model: Command
 });
 
 var CommandBuffer = Backbone.Model.extend({
-  initialize: function() {
+  defaults: {
+    collection: null,
+  },
+
+  initialize: function(options) {
     events.on('gitCommandReady', _.bind(
       this.addCommand, this
     ));
 
-    this.collection = new CommandCollection();
+    options.collection.bind('add', this.addCommand, this);
+
     this.buffer = [];
     this.timeout = null;
     this.delay = 300;
   },
 
   addCommand: function(command) {
-    this.collection.add(command);
     this.buffer.push(command);
     this.touchBuffer();
   },
@@ -50,7 +52,15 @@ var CommandBuffer = Backbone.Model.extend({
 
   popAndProcess: function() {
     var popped = this.buffer.pop();
-    events.trigger('processCommand', popped);
+
+    // find a command with no error
+    while (popped.get('error') && this.buffer.length) {
+      popped = buffer.pop();
+    }
+    // process it if theres no error
+    if (!popped.get('error')) {
+      events.trigger('processCommand', popped);
+    }
   },
 
   clear: function() {
@@ -71,7 +81,5 @@ var CommandBuffer = Backbone.Model.extend({
       this.clear();
     }
   },
-
 });
 
-var commandBuffer = new CommandBuffer();
diff --git a/src/commandline.js b/src/commandline.js
index 70517048..50dc6b24 100644
--- a/src/commandline.js
+++ b/src/commandline.js
@@ -1,10 +1,13 @@
 var Command = Backbone.Model.extend({
   defaults: {
     status: 'inqueue',
+    result: null,
+    error: null,
     generalArgs: [],
     supportedMap: {},
     options: null,
     method: null,
+    createTime: null,
     rawStr: null
   },
 
@@ -12,11 +15,28 @@ var Command = Backbone.Model.extend({
     if (!this.get('rawStr')) {
       throw new Error('Give me a string!');
     }
+    if (!this.get('createTime')) {
+      this.set('createTime', new Date().toString());
+    }
   },
 
   initialize: function() {
     this.validateAtInit();
-    this.parse();
+    this.parseOrCatch();
+  },
+
+  parseOrCatch: function() {
+    try {
+      this.parse();
+    } catch (err) {
+      if (err instanceof CommandProcessError ||
+          err instanceof CommandResult ||
+          err instanceof GitError) {
+        this.set('error', err);
+      } else {
+        throw err;
+      }
+    }
   },
 
   getShortcutMap: function() {
diff --git a/src/legacy.js b/src/legacy.js
index 0add74f3..fd30661b 100644
--- a/src/legacy.js
+++ b/src/legacy.js
@@ -105,36 +105,3 @@ Renderer = function(canvas) {
   return that;
 }
 
-function addRandom() {
-  // Add some random nodes and edges to the graph!
-  nodes = [];
-  for (var i = 0; i < 15; i++) {
-    var id = randomString(8);
-    var node = sys.addNode(id);
-    nodes.push(node);
-  }
-
-  var randNode = function() {
-    var length = nodes.length;
-    var index = Math.floor(Math.random() * length);
-    return nodes[index];
-  };
-
-  var closures = [];
-  for (var i = 0; i < 20; i++) {
-    var node1 = randNode();
-    var node2 = randNode();
-    // lol will it ever end?
-    while (node1 === node2) {
-      node2 = randNode();
-    }
-    sys.addEdge(node1, node2);
-  }
-  for (var i = 0; i < nodes.length; i++) {
-    var node2 = randNode();
-    while (nodes[i] === node2) {
-      node2 = randNode();
-    }
-    sys.addEdge(nodes[i], node2);
-  }
-}
diff --git a/src/mine.js b/src/mine.js
index 4d5a054b..47f6bb2a 100644
--- a/src/mine.js
+++ b/src/mine.js
@@ -2,20 +2,36 @@
  * Globals
  */
 var events = _.clone(Backbone.Events);
+
 var sys = null;
 var graphicsEffects = {};
+
 var gitEngine = null;
 var gitVisuals = null;
 
+var commitCollection = null;
+var commandCollection = null;
+var commandBuffer = null;
+
 $(document).ready(function(){
   sys = arbor.ParticleSystem(4000, 200, 0.5, false, 55, 0.005, 'verlet');
   sys.renderer = Renderer('#viewport');
 
+  // the two major collections that affect everything
+  commitCollection = new CommitCollection();  
+  commandCollection = new CommandCollection();
+
+  commandBuffer = new CommandBuffer({
+    collection: commandCollection
+  });
+
   new CommandPromptView({
-    el: $('#commandLineBar')
+    el: $('#commandLineBar'),
+    collection: commandCollection
   });
   new CommandLineHistoryView({
-    el: $('#commandLineHistory')
+    el: $('#commandLineHistory'),
+    collection: commandCollection
   });
 
   gitEngine = new GitEngine();
diff --git a/src/views.js b/src/views.js
index 21cd057c..c51b21f5 100644
--- a/src/views.js
+++ b/src/views.js
@@ -1,15 +1,8 @@
 var CommandPromptView = Backbone.View.extend({
   initialize: function(options) {
+    this.collection = options.collection;
     this.commands = [];
     this.index = -1;
-
-    events.on('commandSubmitted', _.bind(
-      this.parseOrCatch, this
-    ));
-
-    events.on('processErrorGeneral', _.bind(
-      this.processError, this
-    ));
   },
 
   events: {
@@ -55,24 +48,6 @@ var CommandPromptView = Backbone.View.extend({
     this.setTextField(this.commands[this.index]);
   },
 
-  processError: function(err) {
-    // TODO move this somewhere else!!! it's awkward here
-
-    // in this demo, every command that's not a git command will
-    // throw an exception. Some of these errors might be just to
-    // short-circuit the normal programatic flow and print stuff,
-    // so we handle them here
-    if (err instanceof CommandProcessError) {
-        events.trigger('commandProcessError', err);
-    } else if (err instanceof CommandResult) {
-        events.trigger('commandResultPrint', err);
-    } else if (err instanceof GitError) {
-        events.trigger('commandGitError', err);
-    } else {
-      throw err;
-    }
-  },
-
   setTextField: function(value) {
     this.$('#commandTextField').val(value);
   },
@@ -92,27 +67,20 @@ var CommandPromptView = Backbone.View.extend({
     this.index = -1;
 
     // split commands on semicolon
-    _.each(value.split(';'), function(command) {
+    _.each(value.split(';'), _.bind(function(command) {
       command = command.replace(/^(\s+)/, '');
       command = command.replace(/(\s+)$/, '');
       if (command.length) {
-        events.trigger('commandSubmitted', command);
+        this.addToCollection(command);
       }
-    });
+    }, this));
   },
 
-  parseOrCatch: function(value) {
-    // TODO: move this also
-    try {
-      // parse validation
-      var command = new Command({
-        rawStr: value
-      });
-      // gitCommandReady actually gives it to the gitEngine for dispatch
-      events.trigger('gitCommandReady', command);
-    } catch (err) {
-      events.trigger('processErrorGeneral', err);
-    }
+  addToCollection: function(value) {
+    var command = new Command({
+      rawStr: value
+    });
+    this.collection.add(command);
   }
 });
 
@@ -127,10 +95,12 @@ var CommandView = Backbone.View.extend({
   template: _.template($('#command-template').html()),
 
   events: {
-    'click': 'alert'
+    'click': 'clicked'
   },
 
-  alert: function() { alert('clicked!' + this.get('status')); },
+  clicked: function(e) {
+    console.log('was clicked');
+  },
 
   initialize: function() {
     this.model.bind('change', this.render, this);
@@ -157,92 +127,21 @@ var CommandView = Backbone.View.extend({
 
 var CommandLineHistoryView = Backbone.View.extend({
   initialize: function(options) {
-    events.on('commandSubmitted', _.bind(
-      this.addCommand, this
-    ));
+    this.collection = options.collection;
 
-    events.on('commandProcessError', _.bind(
-      this.commandError, this
-    ));
-
-    // TODO special errors for git?
-    events.on('commandGitError', _.bind(
-      this.commandError, this
-    ));
-
-    events.on('commandProcessWarn', _.bind(
-      this.commandWarn, this
-    ));
-
-    events.on('commandResultPrint', _.bind(
-      this.commandResultPrint, this
-    ));
-
-    // TODO: move these to a real template system
-    this.commandTemplate = ' \
-      <p class="commandLine <%= className %>"> \
-        <span class="arrows">&gt; &gt; &gt;</span> \
-        <%= command %>  \
-      </p> \
-    ';
-
-    this.resultTemplate = ' \
-      <p class="commandLine <%= className %>"> \
-        <%= result %> \
-      </p> \
-    ';
+    this.collection.on('add', this.addOne, this);
+    this.collection.on('reset', this.addAll, this);
+    this.collection.on('all', this.render, this);
   },
 
-  addCommand: function(commandText) {
-    this.$('#commandDisplay').append(
-      _.template(
-        this.commandTemplate,
-        {
-          className: 'pastCommand',
-          command: commandText
-        }
-      )
-    );
+  addOne: function(command) {
+    var view = new CommandView({
+      model: command
+    });
+    this.$('#commandDisplay').append(view.render().el);
   },
 
-  commandError: function(err) {
-    this.$('#commandDisplay').append(
-      _.template(
-        this.resultTemplate,
-        {
-          className: 'errorResult',
-          result: err.toResult()
-        }
-      )
-    );
-  },
-
-  commandWarn: function(msg) {
-    this.$('#commandDisplay').append(
-      _.template(
-        this.resultTemplate,
-        {
-          className: 'commandWarn',
-          result: msg
-        }
-      )
-    );
-  },
-
-  commandResultPrint: function(err) {
-    if (!err.get('msg') || !err.get('msg').length) {
-      console.log(err);
-      // blank lines
-      return;
-    }
-    this.$('#commandDisplay').append(
-      _.template(
-        this.resultTemplate,
-        {
-          className: 'commandResult',
-          result: err.toResult()
-        }
-      )
-    );
+  addAll: function() {
+    this.collection.each(this.addOne);
   }
 });
diff --git a/src/visuals.js b/src/visuals.js
index 1c16ca0f..7fb946d7 100644
--- a/src/visuals.js
+++ b/src/visuals.js
@@ -1,4 +1,7 @@
 function GitVisuals() {
+  this.collection = commitCollection;
+
+  this.collection.on('change', _.bind(this.collectionChanged, this));
   events.on('drawGitVisuals', _.bind(this.drawVisuals, this));
   events.on('fixNodePositions', _.bind(this.fixNodes, this));
 }
@@ -71,6 +74,10 @@ GitVisuals.prototype.drawArrow = function(ctx, start, end, headWidth, offset) {
   ctx.stroke();
 };
 
+GitVisuals.prototype.collectionChanged = function() {
+  // redo the algorithms
+};
+
 GitVisuals.prototype.fixRootCommit = function(sys) {
   // get the viewports bottom center
   var bottomPosScreen = {