diff --git a/handlers/chain_runner.js b/handlers/chain_runner.js
index 3426b199b9e03..deb811c187dd1 100644
--- a/handlers/chain_runner.js
+++ b/handlers/chain_runner.js
@@ -15,182 +15,182 @@ var validateTime = require('./lib/validate_time.js');
 var functions  = loadFunctions('series_functions');
 var fitFunctions  = loadFunctions('fit_functions');
 
-var tlConfig;
-var queryCache = {};
-var stats = {};
-var sheet;
+module.exports = function (tlConfig) {
+  var queryCache = {};
+  var stats = {};
+  var sheet;
 
-function getQueryCacheKey(query) {
-  return JSON.stringify(_.omit(query, 'label'));
-}
+  function getQueryCacheKey(query) {
+    return JSON.stringify(_.omit(query, 'label'));
+  }
 
-function throwWithCell(cell, exception) {
-  throw new Error(' in cell #' + (cell + 1) + ': ' + exception.message);
-}
+  function throwWithCell(cell, exception) {
+    throw new Error(' in cell #' + (cell + 1) + ': ' + exception.message);
+  }
 
-// Invokes a modifier function, resolving arguments into series as needed
-function invoke(fnName, args) {
-  var functionDef = getFunctionByName(fnName);
-
-  args = repositionArguments(functionDef, args);
-  args = _.map(args, function (item) {
-    if (_.isObject(item)) {
-      switch (item.type) {
-        case 'function':
-          var itemFunctionDef = getFunctionByName(item.function);
-          if (itemFunctionDef.cacheKey && queryCache[itemFunctionDef.cacheKey(item)]) {
-            stats.queryCount++;
-            return Promise.resolve(_.cloneDeep(queryCache[itemFunctionDef.cacheKey(item)]));
-          }
-          return invoke(item.function, item.arguments);
-        case 'reference':
-          var reference;
-          if (item.series) {
-            reference = sheet[item.plot - 1][item.series - 1];
-          } else {
-            reference = {
-              type: 'chainList',
-              list: sheet[item.plot - 1]
-            };
-          }
-          return invoke('first', [reference]);
-        case 'chain':
-          return invokeChain(item);
-        case 'chainList':
-          return resolveChainList(item.list);
-        case 'literal':
-          return item.value;
-        case 'requestList':
-        case 'seriesList':
-          return item;
+  // Invokes a modifier function, resolving arguments into series as needed
+  function invoke(fnName, args) {
+    var functionDef = getFunctionByName(fnName);
+
+    args = repositionArguments(functionDef, args);
+    args = _.map(args, function (item) {
+      if (_.isObject(item)) {
+        switch (item.type) {
+          case 'function':
+            var itemFunctionDef = getFunctionByName(item.function);
+            if (itemFunctionDef.cacheKey && queryCache[itemFunctionDef.cacheKey(item)]) {
+              stats.queryCount++;
+              return Promise.resolve(_.cloneDeep(queryCache[itemFunctionDef.cacheKey(item)]));
+            }
+            return invoke(item.function, item.arguments);
+          case 'reference':
+            var reference;
+            if (item.series) {
+              reference = sheet[item.plot - 1][item.series - 1];
+            } else {
+              reference = {
+                type: 'chainList',
+                list: sheet[item.plot - 1]
+              };
+            }
+            return invoke('first', [reference]);
+          case 'chain':
+            return invokeChain(item);
+          case 'chainList':
+            return resolveChainList(item.list);
+          case 'literal':
+            return item.value;
+          case 'requestList':
+          case 'seriesList':
+            return item;
+        }
+        throw new Error ('Argument type not supported: ' + JSON.stringify(item));
+      } else {
+        return item;
       }
-      throw new Error ('Argument type not supported: ' + JSON.stringify(item));
-    } else {
-      return item;
-    }
-  });
-
-
-  return Promise.all(args).then(function (args) {
-    args.byName = indexArguments(functionDef, args);
-    return functionDef.fn(args, tlConfig);
-  });
-}
-
-function invokeChain(chainObj, result) {
-  if (chainObj.chain.length === 0) return result[0];
+    });
 
-  var chain = _.clone(chainObj.chain);
-  var link = chain.shift();
 
-  var promise;
-  if (link.type === 'chain') {
-    promise = invokeChain(link);
-  } else if (!result) {
-    promise = invoke('first', [link]);
-  } else {
-    var args = link.arguments ? result.concat(link.arguments) : result;
-    promise = invoke(link.function, args);
+    return Promise.all(args).then(function (args) {
+      args.byName = indexArguments(functionDef, args);
+      return functionDef.fn(args, tlConfig);
+    });
   }
 
-  return promise.then(function (result) {
-    return invokeChain({type:'chain', chain: chain}, [result]);
-  });
+  function invokeChain(chainObj, result) {
+    if (chainObj.chain.length === 0) return result[0];
 
-}
+    var chain = _.clone(chainObj.chain);
+    var link = chain.shift();
 
-function resolveChainList(chainList) {
-  var seriesList = _.map(chainList, function (chain) {
-    var values = invoke('first', [chain]);
-    return values.then(function (args) {
-      return args;
-    });
-  });
-  return Promise.all(seriesList).then(function (args) {
-    var list = _.chain(args).pluck('list').flatten().value();
-    return {type: 'seriesList', list: list};
-  });
-}
-
-function preProcessSheet(sheet) {
-
-  var queries = {};
-  _.each(sheet, function (chainList, i) {
-    try {
-      var queriesInCell = _.mapValues(preprocessChain(chainList), function (val) {
-        val.cell = i;
-        return val;
-      });
-      queries = _.extend(queries, queriesInCell);
-    } catch (e) {
-      throwWithCell(i, e);
+    var promise;
+    if (link.type === 'chain') {
+      promise = invokeChain(link);
+    } else if (!result) {
+      promise = invoke('first', [link]);
+    } else {
+      var args = link.arguments ? result.concat(link.arguments) : result;
+      promise = invoke(link.function, args);
     }
-  });
-  queries = _.values(queries);
 
-  var promises = _.chain(queries).values().map(function (query) {
-    return invoke(query.function, query.arguments);
-  }).value();
+    return promise.then(function (result) {
+      return invokeChain({type:'chain', chain: chain}, [result]);
+    });
 
-  return Promise.settle(promises).then(function (resolvedDatasources) {
-    stats.queryTime = (new Date()).getTime();
+  }
 
-    _.each(queries, function (query, i) {
-      var functionDef = getFunctionByName(query.function);
-      var resolvedDatasource = resolvedDatasources[i];
+  function resolveChainList(chainList) {
+    var seriesList = _.map(chainList, function (chain) {
+      var values = invoke('first', [chain]);
+      return values.then(function (args) {
+        return args;
+      });
+    });
+    return Promise.all(seriesList).then(function (args) {
+      var list = _.chain(args).pluck('list').flatten().value();
+      return {type: 'seriesList', list: list};
+    });
+  }
 
-      if (resolvedDatasource.isRejected()) {
-        if (resolvedDatasource.reason().isBoom) {
-          throw resolvedDatasource.reason();
-        } else {
-          throwWithCell(query.cell, resolvedDatasource.reason());
-        }
+  function preProcessSheet(sheet) {
+
+    var queries = {};
+    _.each(sheet, function (chainList, i) {
+      try {
+        var queriesInCell = _.mapValues(preprocessChain(chainList), function (val) {
+          val.cell = i;
+          return val;
+        });
+        queries = _.extend(queries, queriesInCell);
+      } catch (e) {
+        throwWithCell(i, e);
       }
-
-      queryCache[functionDef.cacheKey(query)] = resolvedDatasource.value();
     });
+    queries = _.values(queries);
 
-    stats.cacheCount = _.keys(queryCache).length;
-    return queryCache;
-  });
-}
+    var promises = _.chain(queries).values().map(function (query) {
+      return invoke(query.function, query.arguments);
+    }).value();
 
-function processRequest(request) {
-  if (!request) throw new Error('Empty request body');
+    return Promise.settle(promises).then(function (resolvedDatasources) {
 
-  validateTime(request.time, tlConfig);
+      stats.queryTime = (new Date()).getTime();
 
-  tlConfig.time = request.time;
-  tlConfig.time.to = parseDateMath(request.time.to, true).valueOf();
-  tlConfig.time.from = parseDateMath(request.time.from).valueOf();
-  tlConfig.setTargetSeries();
+      _.each(queries, function (query, i) {
+        var functionDef = getFunctionByName(query.function);
+        var resolvedDatasource = resolvedDatasources[i];
 
-  stats.invokeTime = (new Date()).getTime();
-  stats.queryCount = 0;
-  queryCache = {};
-  // This is setting the "global" sheet, required for resolving references
-  sheet = parseSheet(request.sheet);
+        if (resolvedDatasource.isRejected()) {
+          if (resolvedDatasource.reason().isBoom) {
+            throw resolvedDatasource.reason();
+          } else {
+            throwWithCell(query.cell, resolvedDatasource.reason());
+          }
+        }
 
-  return preProcessSheet(sheet).then(function () {
-    return _.map(sheet, function (chainList, i) {
-      return resolveChainList(chainList).then(function (seriesList) {
-        stats.sheetTime = (new Date()).getTime();
-        return seriesList.list;
-      }).catch(function (e) {
-        throwWithCell(i, e);
+        queryCache[functionDef.cacheKey(query)] = resolvedDatasource.value();
       });
+
+      stats.cacheCount = _.keys(queryCache).length;
+      return sheet;
     });
-  });
-}
+  }
+
+  function processRequest(request) {
+    if (!request) throw new Error('Empty request body');
+
+    validateTime(request.time, tlConfig);
+
+    tlConfig.time = request.time;
+    tlConfig.time.to = parseDateMath(request.time.to, true).valueOf();
+    tlConfig.time.from = parseDateMath(request.time.from).valueOf();
+    tlConfig.setTargetSeries();
+
+    stats.invokeTime = (new Date()).getTime();
+    stats.queryCount = 0;
+    queryCache = {};
+
+    // This is setting the "global" sheet, required for resolving references
+    sheet = parseSheet(request.sheet);
+    return preProcessSheet(sheet).then(function () {
+      return _.map(sheet, function (chainList, i) {
+        return resolveChainList(chainList).then(function (seriesList) {
+          stats.sheetTime = (new Date()).getTime();
+          return seriesList.list;
+        }).catch(function (e) {
+          throwWithCell(i, e);
+        });
+      });
+    });
+  }
 
-module.exports = function (_tlConfig_) {
-  tlConfig = _tlConfig_;
   return {
     processRequest: processRequest,
     getStats: function () { return stats; }
   };
 };
 
+
 /*
 function logObj(obj, thing) {
   return JSON.stringify(obj, null, thing ? ' ' : undefined);
diff --git a/package.json b/package.json
index 2e40a017dcaa2..cc23149c1aa72 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "timelion",
-  "version": "0.1.238",
+  "version": "0.1.239",
   "dependencies": {
     "body-parser": "^1.12.0",
     "boom": "^2.8.0",
diff --git a/routes/run.js b/routes/run.js
index dc961f2ecf33f..6c4d7d9d4a3bb 100644
--- a/routes/run.js
+++ b/routes/run.js
@@ -1,6 +1,6 @@
 var Promise = require('bluebird');
 var Boom = require('boom');
-
+var chainRunnerFn = require('../handlers/chain_runner.js');
 
 function replyWithError(e, reply) {
   reply({title: e.toString(), message: e.toString(), stack: e.stack}).code(400);
@@ -17,7 +17,7 @@ module.exports = function (server) {
         server: server,
         request: request
       });
-      var chainRunner = require('../handlers/chain_runner.js')(tlConfig);
+      var chainRunner = chainRunnerFn(tlConfig);
 
       var sheet;
       try {