diff --git a/build/bundle.js b/build/bundle.js
index 94101e40..7866ee84 100644
--- a/build/bundle.js
+++ b/build/bundle.js
@@ -7058,7 +7058,7 @@ var Q = require('q');
 
 var intl = require('../intl');
 
-var AnimationFactoryModule = require('../visuals/animation/animationFactory');
+var AnimationFactory = require('../visuals/animation/animationFactory').AnimationFactory;
 var AnimationQueue = require('../visuals/animation').AnimationQueue;
 var TreeCompare = require('./treeCompare').TreeCompare;
 
@@ -7081,8 +7081,9 @@ function GitEngine(options) {
   this.eventBaton = options.eventBaton;
   this.eventBaton.stealBaton('processGitCommand', this.dispatch, this);
 
+  // poor man's dependency injection
   this.animationFactory = options.animationFactory ||
-    new AnimationFactoryModule.AnimationFactory();
+    AnimationFactory;
 
   // global variable to keep track of the options given
   // along with the command call.
@@ -9136,10 +9137,8 @@ var GRAPHICS = require('../../util/constants').GRAPHICS;
  * and then essentially animate the entire tree too.
  */
 
-// essentially a static class
-var AnimationFactory = function() {
-
-};
+// static class
+var AnimationFactory = {};
 
 var makeCommitBirthAnimation = function(gitVisuals, visNode) {
   var time = GRAPHICS.defaultAnimationTime * 1.0;
@@ -9174,7 +9173,7 @@ var makeHighlightAnimation = function(visNode, visBranch) {
   };
 };
 
-AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, commit, gitVisuals) {
+AnimationFactory.genCommitBirthAnimation = function(animationQueue, commit, gitVisuals) {
   if (!animationQueue) {
     throw new Error("Need animation queue to add closure to!");
   }
@@ -9188,12 +9187,12 @@ AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, co
   }));
 };
 
-AnimationFactory.prototype.genCommitBirthPromiseAnimation = function(commit, gitVisuals) {
+AnimationFactory.genCommitBirthPromiseAnimation = function(commit, gitVisuals) {
   var visNode = commit.get('visNode');
   return new PromiseAnimation(makeCommitBirthAnimation(gitVisuals, visNode));
 };
 
-AnimationFactory.prototype.highlightEachWithPromise = function(
+AnimationFactory.highlightEachWithPromise = function(
   chain,
   toHighlight,
   destObj
@@ -9209,13 +9208,13 @@ AnimationFactory.prototype.highlightEachWithPromise = function(
   return chain;
 };
 
-AnimationFactory.prototype.playCommitBirthPromiseAnimation = function(commit, gitVisuals) {
+AnimationFactory.playCommitBirthPromiseAnimation = function(commit, gitVisuals) {
   var animation = this.genCommitBirthPromiseAnimation(commit, gitVisuals);
   animation.play();
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
+AnimationFactory.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
   var animation = new PromiseAnimation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -9225,7 +9224,7 @@ AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals,
   animationQueue.thenFinish(animation.getPromise());
 };
 
-AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
+AnimationFactory.playRefreshAnimation = function(gitVisuals) {
   var animation = new PromiseAnimation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -9235,7 +9234,7 @@ AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.refreshTree = function(animationQueue, gitVisuals) {
+AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
   animationQueue.add(new Animation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -9243,20 +9242,20 @@ AnimationFactory.prototype.refreshTree = function(animationQueue, gitVisuals) {
   }));
 };
 
-AnimationFactory.prototype.genHighlightPromiseAnimation = function(commit, destObj) {
+AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
   // could be branch or node
   var visObj = destObj.get('visBranch') || destObj.get('visNode');
   var visNode = commit.get('visNode');
   return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
 };
 
-AnimationFactory.prototype.playHighlightPromiseAnimation = function(commit, destObj) {
+AnimationFactory.playHighlightPromiseAnimation = function(commit, destObj) {
   var animation = this.genHighlightPromiseAnimation(commit, destObj);
   animation.play();
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.delay = function(animationQueue, time) {
+AnimationFactory.delay = function(animationQueue, time) {
   time = time || GRAPHICS.defaultAnimationTime;
   animationQueue.add(new Animation({
     closure: function() { },
@@ -22855,7 +22854,7 @@ var Q = require('q');
 
 var intl = require('../intl');
 
-var AnimationFactoryModule = require('../visuals/animation/animationFactory');
+var AnimationFactory = require('../visuals/animation/animationFactory').AnimationFactory;
 var AnimationQueue = require('../visuals/animation').AnimationQueue;
 var TreeCompare = require('./treeCompare').TreeCompare;
 
@@ -22878,8 +22877,9 @@ function GitEngine(options) {
   this.eventBaton = options.eventBaton;
   this.eventBaton.stealBaton('processGitCommand', this.dispatch, this);
 
+  // poor man's dependency injection
   this.animationFactory = options.animationFactory ||
-    new AnimationFactoryModule.AnimationFactory();
+    AnimationFactory;
 
   // global variable to keep track of the options given
   // along with the command call.
@@ -31136,10 +31136,8 @@ var GRAPHICS = require('../../util/constants').GRAPHICS;
  * and then essentially animate the entire tree too.
  */
 
-// essentially a static class
-var AnimationFactory = function() {
-
-};
+// static class
+var AnimationFactory = {};
 
 var makeCommitBirthAnimation = function(gitVisuals, visNode) {
   var time = GRAPHICS.defaultAnimationTime * 1.0;
@@ -31174,7 +31172,7 @@ var makeHighlightAnimation = function(visNode, visBranch) {
   };
 };
 
-AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, commit, gitVisuals) {
+AnimationFactory.genCommitBirthAnimation = function(animationQueue, commit, gitVisuals) {
   if (!animationQueue) {
     throw new Error("Need animation queue to add closure to!");
   }
@@ -31188,12 +31186,12 @@ AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, co
   }));
 };
 
-AnimationFactory.prototype.genCommitBirthPromiseAnimation = function(commit, gitVisuals) {
+AnimationFactory.genCommitBirthPromiseAnimation = function(commit, gitVisuals) {
   var visNode = commit.get('visNode');
   return new PromiseAnimation(makeCommitBirthAnimation(gitVisuals, visNode));
 };
 
-AnimationFactory.prototype.highlightEachWithPromise = function(
+AnimationFactory.highlightEachWithPromise = function(
   chain,
   toHighlight,
   destObj
@@ -31209,13 +31207,13 @@ AnimationFactory.prototype.highlightEachWithPromise = function(
   return chain;
 };
 
-AnimationFactory.prototype.playCommitBirthPromiseAnimation = function(commit, gitVisuals) {
+AnimationFactory.playCommitBirthPromiseAnimation = function(commit, gitVisuals) {
   var animation = this.genCommitBirthPromiseAnimation(commit, gitVisuals);
   animation.play();
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
+AnimationFactory.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
   var animation = new PromiseAnimation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -31225,7 +31223,7 @@ AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals,
   animationQueue.thenFinish(animation.getPromise());
 };
 
-AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
+AnimationFactory.playRefreshAnimation = function(gitVisuals) {
   var animation = new PromiseAnimation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -31235,7 +31233,7 @@ AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.refreshTree = function(animationQueue, gitVisuals) {
+AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
   animationQueue.add(new Animation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -31243,20 +31241,20 @@ AnimationFactory.prototype.refreshTree = function(animationQueue, gitVisuals) {
   }));
 };
 
-AnimationFactory.prototype.genHighlightPromiseAnimation = function(commit, destObj) {
+AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
   // could be branch or node
   var visObj = destObj.get('visBranch') || destObj.get('visNode');
   var visNode = commit.get('visNode');
   return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
 };
 
-AnimationFactory.prototype.playHighlightPromiseAnimation = function(commit, destObj) {
+AnimationFactory.playHighlightPromiseAnimation = function(commit, destObj) {
   var animation = this.genHighlightPromiseAnimation(commit, destObj);
   animation.play();
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.delay = function(animationQueue, time) {
+AnimationFactory.delay = function(animationQueue, time) {
   time = time || GRAPHICS.defaultAnimationTime;
   animationQueue.add(new Animation({
     closure: function() { },
diff --git a/src/js/git/headless.js b/src/js/git/headless.js
index a0d44e76..e23db297 100644
--- a/src/js/git/headless.js
+++ b/src/js/git/headless.js
@@ -16,6 +16,16 @@ var Command = require('../models/commandModel').Command;
 var mock = require('../util/mock').mock;
 var util = require('../util');
 
+function getMockFactory() {
+  var mockFactory = {};
+  for (var key in AnimationFactory) {
+    mockFactory[key] = function() {
+      return Q.defer().promise;
+    };
+  }
+  return mockFactory;
+}
+
 var HeadlessGit = function() {
   this.init();
 };
@@ -27,7 +37,7 @@ HeadlessGit.prototype.init = function() {
 
   // here we mock visuals and animation factory so the git engine
   // is headless
-  var animationFactory = mock(AnimationFactory);
+  var animationFactory = getMockFactory();
   var gitVisuals = mock(GitVisuals);
 
   this.gitEngine = new GitEngine({
diff --git a/src/js/git/index.js b/src/js/git/index.js
index 1de5e2ca..40ffcd5d 100644
--- a/src/js/git/index.js
+++ b/src/js/git/index.js
@@ -5,7 +5,7 @@ var Q = require('q');
 
 var intl = require('../intl');
 
-var AnimationFactoryModule = require('../visuals/animation/animationFactory');
+var AnimationFactory = require('../visuals/animation/animationFactory').AnimationFactory;
 var AnimationQueue = require('../visuals/animation').AnimationQueue;
 var TreeCompare = require('./treeCompare').TreeCompare;
 
@@ -28,8 +28,9 @@ function GitEngine(options) {
   this.eventBaton = options.eventBaton;
   this.eventBaton.stealBaton('processGitCommand', this.dispatch, this);
 
+  // poor man's dependency injection
   this.animationFactory = options.animationFactory ||
-    new AnimationFactoryModule.AnimationFactory();
+    AnimationFactory;
 
   // global variable to keep track of the options given
   // along with the command call.
diff --git a/src/js/visuals/animation/animationFactory.js b/src/js/visuals/animation/animationFactory.js
index 06d198a0..2f4e173c 100644
--- a/src/js/visuals/animation/animationFactory.js
+++ b/src/js/visuals/animation/animationFactory.js
@@ -15,10 +15,8 @@ var GRAPHICS = require('../../util/constants').GRAPHICS;
  * and then essentially animate the entire tree too.
  */
 
-// essentially a static class
-var AnimationFactory = function() {
-
-};
+// static class
+var AnimationFactory = {};
 
 var makeCommitBirthAnimation = function(gitVisuals, visNode) {
   var time = GRAPHICS.defaultAnimationTime * 1.0;
@@ -53,7 +51,7 @@ var makeHighlightAnimation = function(visNode, visBranch) {
   };
 };
 
-AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, commit, gitVisuals) {
+AnimationFactory.genCommitBirthAnimation = function(animationQueue, commit, gitVisuals) {
   if (!animationQueue) {
     throw new Error("Need animation queue to add closure to!");
   }
@@ -67,12 +65,12 @@ AnimationFactory.prototype.genCommitBirthAnimation = function(animationQueue, co
   }));
 };
 
-AnimationFactory.prototype.genCommitBirthPromiseAnimation = function(commit, gitVisuals) {
+AnimationFactory.genCommitBirthPromiseAnimation = function(commit, gitVisuals) {
   var visNode = commit.get('visNode');
   return new PromiseAnimation(makeCommitBirthAnimation(gitVisuals, visNode));
 };
 
-AnimationFactory.prototype.highlightEachWithPromise = function(
+AnimationFactory.highlightEachWithPromise = function(
   chain,
   toHighlight,
   destObj
@@ -88,13 +86,13 @@ AnimationFactory.prototype.highlightEachWithPromise = function(
   return chain;
 };
 
-AnimationFactory.prototype.playCommitBirthPromiseAnimation = function(commit, gitVisuals) {
+AnimationFactory.playCommitBirthPromiseAnimation = function(commit, gitVisuals) {
   var animation = this.genCommitBirthPromiseAnimation(commit, gitVisuals);
   animation.play();
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
+AnimationFactory.playRefreshAnimationAndFinish = function(gitVisuals, animationQueue) {
   var animation = new PromiseAnimation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -104,7 +102,7 @@ AnimationFactory.prototype.playRefreshAnimationAndFinish = function(gitVisuals,
   animationQueue.thenFinish(animation.getPromise());
 };
 
-AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
+AnimationFactory.playRefreshAnimation = function(gitVisuals) {
   var animation = new PromiseAnimation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -114,7 +112,7 @@ AnimationFactory.prototype.playRefreshAnimation = function(gitVisuals) {
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.refreshTree = function(animationQueue, gitVisuals) {
+AnimationFactory.refreshTree = function(animationQueue, gitVisuals) {
   animationQueue.add(new Animation({
     closure: function() {
       gitVisuals.refreshTree();
@@ -122,20 +120,20 @@ AnimationFactory.prototype.refreshTree = function(animationQueue, gitVisuals) {
   }));
 };
 
-AnimationFactory.prototype.genHighlightPromiseAnimation = function(commit, destObj) {
+AnimationFactory.genHighlightPromiseAnimation = function(commit, destObj) {
   // could be branch or node
   var visObj = destObj.get('visBranch') || destObj.get('visNode');
   var visNode = commit.get('visNode');
   return new PromiseAnimation(makeHighlightAnimation(visNode, visObj));
 };
 
-AnimationFactory.prototype.playHighlightPromiseAnimation = function(commit, destObj) {
+AnimationFactory.playHighlightPromiseAnimation = function(commit, destObj) {
   var animation = this.genHighlightPromiseAnimation(commit, destObj);
   animation.play();
   return animation.getPromise();
 };
 
-AnimationFactory.prototype.delay = function(animationQueue, time) {
+AnimationFactory.delay = function(animationQueue, time) {
   time = time || GRAPHICS.defaultAnimationTime;
   animationQueue.add(new Animation({
     closure: function() { },