diff --git a/docs/components/docs/docs-directives.js b/docs/components/docs/docs-directives.js
new file mode 100644
index 000000000000..0295fb30f334
--- /dev/null
+++ b/docs/components/docs/docs-directives.js
@@ -0,0 +1,12 @@
+angular.module('gcloud.docs')
+  .directive('docsExample', function($compile) {
+    'use strict';
+
+    return {
+      link: function(scope, element, attr) {
+        scope.$watch(attr.ngBindHtml, function() {
+          $compile(element.contents())(scope);
+        }, true);
+      }
+    };
+  });
diff --git a/docs/components/docs/docs-services.js b/docs/components/docs/docs-services.js
new file mode 100644
index 000000000000..e4dd98477223
--- /dev/null
+++ b/docs/components/docs/docs-services.js
@@ -0,0 +1,24 @@
+angular.module('gcloud.docs')
+  .factory('getLinks', function(pages) {
+    'use strict';
+
+    return function(version) {
+      var baseUrl = '#/docs/' + version;
+      var VERSIONS = pages.VERSIONS;
+      var versions;
+      var match;
+      if (!version || version === 'master') {
+        versions = Object.keys(VERSIONS);
+        match = versions[versions.length - 1];
+      } else {
+        match = Object.keys(VERSIONS).filter(semver.satisfies.bind(null, version))[0];
+      }
+      return VERSIONS[match]
+        .map(function(module) {
+          if (pages[module]._url) {
+            pages[module].url = pages[module]._url.replace('{baseUrl}', baseUrl);
+          }
+          return pages[module];
+        });
+    };
+  });
diff --git a/docs/components/docs/docs-values.js b/docs/components/docs/docs-values.js
new file mode 100644
index 000000000000..fc3f9952daae
--- /dev/null
+++ b/docs/components/docs/docs-values.js
@@ -0,0 +1,54 @@
+angular.module('gcloud.docs')
+  .value('pages', {
+    gcloud: {
+      title: 'gcloud',
+      _url: '{baseUrl}'
+    },
+
+    datastore: {
+      title: 'Datastore',
+      _url: '{baseUrl}/datastore',
+      pages: [
+        {
+          title: 'Dataset',
+          url: '/dataset'
+        },
+        {
+          title: 'Query',
+          url: '/query'
+        }
+      ]
+    },
+
+    datastoreWithTransaction: {
+      title: 'Datastore',
+      _url: '{baseUrl}/datastore',
+      pages: [
+        {
+          title: 'Dataset',
+          url: '/dataset'
+        },
+        {
+          title: 'Transaction',
+          url: '/transaction'
+        },
+        {
+          title: 'Query',
+          url: '/query'
+        }
+      ]
+    },
+
+    storage: {
+      title: 'Storage',
+      _url: '{baseUrl}/storage'
+    },
+
+    VERSIONS: {
+      // Give a version with/without a comparator, anything semver:
+      //   https://github.com/npm/node-semver#versions
+      // List should be in ascending order.
+      '<=0.7.1': ['gcloud', 'datastore', 'storage'],
+      '>0.7.1': ['gcloud', 'datastoreWithTransaction', 'storage']
+    }
+  });
diff --git a/docs/components/docs/docs.html b/docs/components/docs/docs.html
index be0e1e0d3f5a..eb6ead22cab9 100644
--- a/docs/components/docs/docs.html
+++ b/docs/components/docs/docs.html
@@ -45,13 +45,13 @@ <h3 class="sub-heading">
           However, if you're running your app elsewhere, you will need to provide this information.
         </p>
         <div hljs>
-  // App Engine and Compute Engine
-  var gcloud = require('gcloud');
+// App Engine and Compute Engine
+var gcloud = require('gcloud');
 
-  // Elsewhere
-  var gcloud = require('gcloud')({
-    keyFilename: '/path/to/keyfile.json'
-  });</div>
+// Elsewhere
+var gcloud = require('gcloud')({
+  keyFilename: '/path/to/keyfile.json'
+});</div>
         <p>
           In any environment, you are free to provide these and other default properties, which eventually will be passed to the <code>gcloud</code> sub-modules (Datastore, Storage, etc.).
         </p>
@@ -98,8 +98,7 @@ <h2 ng-if="method.name[0].toUpperCase() === method.name[0]">
           ng-if="method.name[0].toUpperCase() !== method.name[0]">
           <a
             class="permalink"
-            ng-if="!noPermalink"
-            ng-href="{{activeUrl + '/' + method.name}}">#</a>
+            ng-href="{{activeUrl + '?method=' + method.name}}">#</a>
           {{method.name}}
         </h3>
         <p ng-if="method.description" ng-bind-html="method.description"></p>
@@ -118,9 +117,8 @@ <h4 ng-show="method.params">Parameters</h4>
         <h4 ng-show="method.returns">Returns</h4>
         <p ng-show="method.returns" ng-bind-html="method.returns"></p>
         <h4 ng-show="method.example">Example</h4>
-        <div ng-repeat-end
-          ng-show="method.example"
-          hljs source="method.example" language="js"></div>
+        <div docs-example ng-repeat-end
+          ng-show="method.example" ng-bind-html="method.example"></div>
         <hr ng-if="$index < methods.length - 1">
       </article>
     </article>
@@ -135,7 +133,7 @@ <h4 ng-show="method.example">Example</h4>
 
   <nav class="side-nav">
     <ul class="page-sections" ng-show="showReference">
-      <li ng-repeat="page in pages">
+      <li ng-repeat="page in links">
         <a
           ng-class="{ current: isActiveUrl(page.url) }"
           ng-href="{{page.url}}">
diff --git a/docs/components/docs/docs.js b/docs/components/docs/docs.js
index da018a448427..98d3dc89ca73 100644
--- a/docs/components/docs/docs.js
+++ b/docs/components/docs/docs.js
@@ -4,14 +4,41 @@ angular
     'use strict';
 
     function filterDocJson($sce, version) {
-      // Transform JSON response to remove extraneous objects, such as copyright
-      // notices & use strict directives.
+      // Transform JSON response to remove extraneous objects.
       function formatHtml(str) {
         return str
             .replace(/\s+/g, ' ')
             .replace(/<br *\/*>/g, ' ')
             .replace(/`([^`]*)`/g, '<code>$1</code>');
       }
+      function formatComments(str) {
+        var matched = 0;
+        var paragraphComments = /\/\/-+((\n|\r|.)*?(\/\/-))/g;
+
+        if (!paragraphComments.test(str)) {
+          return '<div hljs language="javascript">\n' + str + '</div>';
+        }
+
+        str = str.replace(paragraphComments, function(match, block) {
+          return '' +
+              (++matched > 1 ? '</div>' : '') +
+              '<p>' +
+              formatHtml(detectLinks(detectModules(
+                block.trim()
+                  .replace(/\/\/-*\s*/g, '\n')
+                  .replace(/\n\n/g, '\n')
+                  .replace(/(\w)\n(\w)/g, '$1 $2')
+                  .replace(/\n\n/g, '</p><p>')
+              ))) +
+              '</p>' +
+              '<div hljs language="javascript">';
+        });
+
+        str = str.replace(/(<div[^>]*>)\n+/g, '$1\n');
+        str = str.replace(/\n<\/div>/g, '</div>');
+
+        return str;
+      }
       function detectLinks(str) {
         var regex = {
           withCode: /{@linkcode <a href="([^\"]*)">([^<]*)<\/a>/g,
@@ -42,13 +69,23 @@ angular
         };
         var a = document.createElement('a');
         return str.replace(regex.see, function(match, module) {
-          a.href = '#/docs/' + version + '/' + module;
+          var path = module;
+          if (path.indexOf('#') > -1) {
+            path = path.split('#').map(function(part, index, parts) {
+              if (index < parts.length - 1) {
+                return part + '/';
+              } else {
+                return '?method=' + part;
+              }
+            }).join('');
+          }
+          a.href = '#/docs/' + version + '/' + path;
           a.innerText = module;
           return a.outerHTML;
         });
       }
       function reduceModules(acc, type, index, types) {
-        var CUSTOM_TYPES = ['query', 'dataset'];
+        var CUSTOM_TYPES = ['query', 'dataset', 'transaction'];
         if (CUSTOM_TYPES.indexOf(type.toLowerCase()) > -1) {
           if (types[index - 1]) {
             type = types[index - 1] + '/' + type;
@@ -70,6 +107,9 @@ angular
               constructor: obj.tags.some(function(tag) {
                   return tag.type === 'constructor';
                 }),
+              mixes: obj.tags.filter(function(tag) {
+                  return tag.type === 'mixes';
+                }),
               description: $sce.trustAsHtml(
                   formatHtml(detectLinks(detectModules(obj.description.full)))),
               params: obj.tags.filter(function(tag) {
@@ -88,13 +128,13 @@ angular
                 })
                 .map(function(tag) {
                   return $sce.trustAsHtml(
-                      tag.types.reduceRight(reduceModules, [])[0])
+                      tag.types.reduceRight(reduceModules, [])[0]);
                 })[0],
               example: obj.tags.filter(function(tag) {
-                  return tag.type === 'example'
+                  return tag.type === 'example';
                 })
                 .map(function(tag) {
-                  return tag.string;
+                  return $sce.trustAsHtml(formatComments(tag.string));
                 })[0]
             };
           })
@@ -104,24 +144,77 @@ angular
       };
     }
 
-    function setMethod($location, methodName, version) {
-      return function(methods) {
-        var methodExists = methods.some(function(methodObj) {
-          return methodName === methodObj.name;
+    function getMixIns($sce, $q, $http, version, baseUrl) {
+      return function(data) {
+        var methodWithMixIns = data.filter(function(method) {
+          return method.mixes;
+        })[0];
+        if (!methodWithMixIns) {
+          return data;
+        }
+        return $q
+          .all(getMixInMethods(methodWithMixIns))
+          .then(combineMixInMethods(data));
+      };
+      function getMixInMethods(method) {
+        return method.mixes.map(function (module) {
+          module = module.string.trim().replace('module:', '');
+          return $http.get(baseUrl + '/' + module + '.json')
+              .then(filterDocJson($sce, version))
+              .then(function(mixInData) {
+                return mixInData.filter(function(method) {
+                  return !method.constructor;
+                });
+              });
         });
-        if (methodExists) {
-          methods.singleMethod = methodName;
-          return methods;
-        } else {
-          $location.path('/docs/' + version + '/' + module + '/' + cl);
+      }
+      function combineMixInMethods(data) {
+        return function(mixInData) {
+          return mixInData
+            .reduce(function(acc, mixInMethods) {
+              return acc = acc.concat(mixInMethods);
+            }, data)
+            .sort(function(a, b) {
+              return a.name > b.name;
+            });
+        };
+      }
+    }
+
+    function setSingleMethod(method) {
+      return function(methods) {
+        if (method && methods.some(function(methodObj) {
+          return methodObj.name === method;
+        })) {
+          methods.singleMethod = method;
         }
+        return methods;
       };
     }
 
-    var MODULE_TO_CLASSES = {
-      datastore: ['dataset', 'query'],
-      storage: []
-    };
+    function getMethods($http, $route, $sce, $q, $location) {
+      var version = $route.current.params.version;
+      var module = $route.current.params.module;
+      var cl = $route.current.params.class;
+      var path = ['json', version];
+      if (!module && !cl) {
+        path.push('index.json');
+      } else if (module && !cl) {
+        path.push(module);
+        path.push('index.json');
+      } else if (module && cl) {
+        path.push(module);
+        path.push(cl + '.json');
+      }
+      return $http.get(path.join('/'))
+          .then(filterDocJson($sce, version))
+          .then(getMixIns($sce, $q, $http, version, 'json/' + version))
+          .then(setSingleMethod($location.search().method));
+    }
+
+    function getLinks($route, getLinks) {
+      return getLinks($route.current.params.version);
+    }
 
     $routeProvider
       .when('/docs', {
@@ -134,72 +227,23 @@ angular
       .when('/docs/:version', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
-        resolve: {
-          methods: function($http, $route, $sce) {
-            var version = $route.current.params.version;
-            return $http.get('json/' + version + '/index.json')
-                .then(filterDocJson($sce, version))
-                .then(function(methods) {
-                  // Prevent displaying permalinks.
-                  // ** Can remove when PubSub api is documented **
-                  methods.noPermalink = true;
-                  return methods;
-                });
-          }
-        }
+        resolve: { methods: getMethods, links: getLinks }
       })
       .when('/docs/:version/:module', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
-        resolve: {
-          methods: function($http, $route, $sce) {
-            var version = $route.current.params.version;
-            var module = $route.current.params.module;
-            return $http.get('json/' + version + '/' + module + '/index.json')
-                .then(filterDocJson($sce, version));
-          }
-        }
+        resolve: { methods: getMethods, links: getLinks }
       })
       .when('/docs/:version/:module/:class', {
         controller: 'DocsCtrl',
         templateUrl: 'components/docs/docs.html',
-        resolve: {
-          methods: function($q, $http, $route, $sce, $location) {
-            var version = $route.current.params.version;
-            var module = $route.current.params.module;
-            var cl = $route.current.params.class;
-            if (MODULE_TO_CLASSES[module].length > 0) {
-              return $http
-                  .get('json/' + version + '/' + module + '/' + cl + '.json')
-                  .then(filterDocJson($sce, version));
-            } else {
-              // This is not a class, this is the name of a method.
-              var method = cl;
-              return $http.get('json/' + version + '/' +module + '/index.json')
-                  .then(filterDocJson($sce, version))
-                  .then(setMethod($location, method, version));
-            }
-          }
-        }
-      })
-      .when('/docs/:version/:module/:class/:method', {
-        controller: 'DocsCtrl',
-        templateUrl: 'components/docs/docs.html',
-        resolve: {
-          methods: function($q, $http, $route, $sce, $location) {
-            var version = $route.current.params.version;
-            var module = $route.current.params.module;
-            var cl = $route.current.params.class;
-            var method = $route.current.params.method;
-            return $http.get('json/' + version + '/' + module + '/' + cl + '.json')
-                .then(filterDocJson($sce, version))
-                .then(setMethod($location, method, version));
-          }
-        }
+        resolve: { methods: getMethods, links: getLinks }
       });
   })
 
   .run(function($location, $route, $rootScope, versions) {
+    'use strict';
+
     $rootScope.$on('$routeChangeStart', function(event, route) {
       var url = $location.path();
       if (url.indexOf('/docs/') === -1 || (!route.params || !route.params.version)) {
@@ -217,7 +261,7 @@ angular
     });
   })
 
-  .controller('DocsCtrl', function($location, $scope, $routeParams, methods, $http, versions) {
+  .controller('DocsCtrl', function($location, $scope, $routeParams, methods, $http, links, versions) {
     'use strict';
 
     $scope.isActiveUrl = function(url) {
@@ -236,44 +280,17 @@ angular
     $scope.showReference = true;
     $scope.activeUrl = '#' + $location.path();
     $scope.singleMethod = methods.singleMethod;
-    $scope.noPermalink = methods.singleMethod || methods.noPermalink;
-    $scope.methods = methods;
     $scope.module = $routeParams.module;
+    $scope.methods = methods;
     $scope.version = $routeParams.version;
     $scope.isLatestVersion = $scope.version == versions[0];
     $scope.versions = versions;
-    var baseUrl = '#/docs/' + $scope.version;
-    /*
-    TODO(silvano): future versions will introduce new pages, so the list below will have
-    to be generated according to the specific version
-    */
-    $scope.pages = [
-      {
-        title: 'gcloud',
-        url: baseUrl
-      },
-      {
-        title: 'Datastore',
-        url: baseUrl + '/datastore',
-        pages: [
-          {
-            title: 'Dataset',
-            url: '/dataset'
-          },
-          {
-            title: 'Query',
-            url: '/query'
-          }
-        ]
-      },
-      {
-        title: 'Storage',
-        url: baseUrl + '/storage'
-      }
-    ];
+    $scope.links = links;
   })
 
   .controller('HistoryCtrl', function($scope, versions) {
+    'use strict';
+
     $scope.pageTitle = 'Node.js Docs Versions';
     $scope.showHistory = true;
     $scope.versions = versions;
diff --git a/docs/index.html b/docs/index.html
index daeec618fc77..60740144fad9 100755
--- a/docs/index.html
+++ b/docs/index.html
@@ -26,8 +26,12 @@
     <script src="//code.angularjs.org/1.2.23/angular-route.js"></script>
     <script src="//yandex.st/highlightjs/8.0/highlight.min.js"></script>
     <script src="//pc035860.github.io/angular-highlightjs/angular-highlightjs.min.js"></script>
+    <script src="lib/semver.js"></script>
     <script src="home.js"></script>
     <script src="components/docs/docs.js"></script>
+    <script src="components/docs/docs-directives.js"></script>
+    <script src="components/docs/docs-services.js"></script>
+    <script src="components/docs/docs-values.js"></script>
 
     <script>
       (function() {
diff --git a/docs/lib/semver.js b/docs/lib/semver.js
new file mode 100644
index 000000000000..afb68ac0c45a
--- /dev/null
+++ b/docs/lib/semver.js
@@ -0,0 +1,1098 @@
+;(function(exports) {
+
+// export the class if we are in a Node-like system.
+if (typeof module === 'object' && module.exports === exports)
+  exports = module.exports = SemVer;
+
+// The debug function is excluded entirely from the minified version.
+
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+exports.SEMVER_SPEC_VERSION = '2.0.0';
+
+// The actual regexps go on exports.re
+var re = exports.re = [];
+var src = exports.src = [];
+var R = 0;
+
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
+
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
+
+var NUMERICIDENTIFIER = R++;
+src[NUMERICIDENTIFIER] = '0|[1-9]\\d*';
+var NUMERICIDENTIFIERLOOSE = R++;
+src[NUMERICIDENTIFIERLOOSE] = '[0-9]+';
+
+
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
+
+var NONNUMERICIDENTIFIER = R++;
+src[NONNUMERICIDENTIFIER] = '\\d*[a-zA-Z-][a-zA-Z0-9-]*';
+
+
+// ## Main Version
+// Three dot-separated numeric identifiers.
+
+var MAINVERSION = R++;
+src[MAINVERSION] = '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')\\.' +
+                   '(' + src[NUMERICIDENTIFIER] + ')';
+
+var MAINVERSIONLOOSE = R++;
+src[MAINVERSIONLOOSE] = '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')\\.' +
+                        '(' + src[NUMERICIDENTIFIERLOOSE] + ')';
+
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
+
+var PRERELEASEIDENTIFIER = R++;
+src[PRERELEASEIDENTIFIER] = '(?:' + src[NUMERICIDENTIFIER] +
+                            '|' + src[NONNUMERICIDENTIFIER] + ')';
+
+var PRERELEASEIDENTIFIERLOOSE = R++;
+src[PRERELEASEIDENTIFIERLOOSE] = '(?:' + src[NUMERICIDENTIFIERLOOSE] +
+                                 '|' + src[NONNUMERICIDENTIFIER] + ')';
+
+
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
+
+var PRERELEASE = R++;
+src[PRERELEASE] = '(?:-(' + src[PRERELEASEIDENTIFIER] +
+                  '(?:\\.' + src[PRERELEASEIDENTIFIER] + ')*))';
+
+var PRERELEASELOOSE = R++;
+src[PRERELEASELOOSE] = '(?:-?(' + src[PRERELEASEIDENTIFIERLOOSE] +
+                       '(?:\\.' + src[PRERELEASEIDENTIFIERLOOSE] + ')*))';
+
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
+
+var BUILDIDENTIFIER = R++;
+src[BUILDIDENTIFIER] = '[0-9A-Za-z-]+';
+
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
+
+var BUILD = R++;
+src[BUILD] = '(?:\\+(' + src[BUILDIDENTIFIER] +
+             '(?:\\.' + src[BUILDIDENTIFIER] + ')*))';
+
+
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
+
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups.  The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
+
+var FULL = R++;
+var FULLPLAIN = 'v?' + src[MAINVERSION] +
+                src[PRERELEASE] + '?' +
+                src[BUILD] + '?';
+
+src[FULL] = '^' + FULLPLAIN + '$';
+
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+var LOOSEPLAIN = '[v=\\s]*' + src[MAINVERSIONLOOSE] +
+                 src[PRERELEASELOOSE] + '?' +
+                 src[BUILD] + '?';
+
+var LOOSE = R++;
+src[LOOSE] = '^' + LOOSEPLAIN + '$';
+
+var GTLT = R++;
+src[GTLT] = '((?:<|>)?=?)';
+
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+var XRANGEIDENTIFIERLOOSE = R++;
+src[XRANGEIDENTIFIERLOOSE] = src[NUMERICIDENTIFIERLOOSE] + '|x|X|\\*';
+var XRANGEIDENTIFIER = R++;
+src[XRANGEIDENTIFIER] = src[NUMERICIDENTIFIER] + '|x|X|\\*';
+
+var XRANGEPLAIN = R++;
+src[XRANGEPLAIN] = '[v=\\s]*(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:\\.(' + src[XRANGEIDENTIFIER] + ')' +
+                   '(?:' + src[PRERELEASE] + ')?' +
+                   src[BUILD] + '?' +
+                   ')?)?';
+
+var XRANGEPLAINLOOSE = R++;
+src[XRANGEPLAINLOOSE] = '[v=\\s]*(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:\\.(' + src[XRANGEIDENTIFIERLOOSE] + ')' +
+                        '(?:' + src[PRERELEASELOOSE] + ')?' +
+                        src[BUILD] + '?' +
+                        ')?)?';
+
+var XRANGE = R++;
+src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
+var XRANGELOOSE = R++;
+src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
+
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+var LONETILDE = R++;
+src[LONETILDE] = '(?:~>?)';
+
+var TILDETRIM = R++;
+src[TILDETRIM] = '(\\s*)' + src[LONETILDE] + '\\s+';
+re[TILDETRIM] = new RegExp(src[TILDETRIM], 'g');
+var tildeTrimReplace = '$1~';
+
+var TILDE = R++;
+src[TILDE] = '^' + src[LONETILDE] + src[XRANGEPLAIN] + '$';
+var TILDELOOSE = R++;
+src[TILDELOOSE] = '^' + src[LONETILDE] + src[XRANGEPLAINLOOSE] + '$';
+
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+var LONECARET = R++;
+src[LONECARET] = '(?:\\^)';
+
+var CARETTRIM = R++;
+src[CARETTRIM] = '(\\s*)' + src[LONECARET] + '\\s+';
+re[CARETTRIM] = new RegExp(src[CARETTRIM], 'g');
+var caretTrimReplace = '$1^';
+
+var CARET = R++;
+src[CARET] = '^' + src[LONECARET] + src[XRANGEPLAIN] + '$';
+var CARETLOOSE = R++;
+src[CARETLOOSE] = '^' + src[LONECARET] + src[XRANGEPLAINLOOSE] + '$';
+
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+var COMPARATORLOOSE = R++;
+src[COMPARATORLOOSE] = '^' + src[GTLT] + '\\s*(' + LOOSEPLAIN + ')$|^$';
+var COMPARATOR = R++;
+src[COMPARATOR] = '^' + src[GTLT] + '\\s*(' + FULLPLAIN + ')$|^$';
+
+
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+var COMPARATORTRIM = R++;
+src[COMPARATORTRIM] = '(\\s*)' + src[GTLT] +
+                      '\\s*(' + LOOSEPLAIN + '|' + src[XRANGEPLAIN] + ')';
+
+// this one has to use the /g flag
+re[COMPARATORTRIM] = new RegExp(src[COMPARATORTRIM], 'g');
+var comparatorTrimReplace = '$1$2$3';
+
+
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+var HYPHENRANGE = R++;
+src[HYPHENRANGE] = '^\\s*(' + src[XRANGEPLAIN] + ')' +
+                   '\\s+-\\s+' +
+                   '(' + src[XRANGEPLAIN] + ')' +
+                   '\\s*$';
+
+var HYPHENRANGELOOSE = R++;
+src[HYPHENRANGELOOSE] = '^\\s*(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s+-\\s+' +
+                        '(' + src[XRANGEPLAINLOOSE] + ')' +
+                        '\\s*$';
+
+// Star ranges basically just allow anything at all.
+var STAR = R++;
+src[STAR] = '(<|>)?=?\\s*\\*';
+
+// Compile to actual regexp objects.
+// All are flag-free, unless they were created above with a flag.
+for (var i = 0; i < R; i++) {
+  ;
+  if (!re[i])
+    re[i] = new RegExp(src[i]);
+}
+
+exports.parse = parse;
+function parse(version, loose) {
+  var r = loose ? re[LOOSE] : re[FULL];
+  return (r.test(version)) ? new SemVer(version, loose) : null;
+}
+
+exports.valid = valid;
+function valid(version, loose) {
+  var v = parse(version, loose);
+  return v ? v.version : null;
+}
+
+
+exports.clean = clean;
+function clean(version, loose) {
+  var s = parse(version.trim().replace(/^[=v]+/, ''), loose);
+  return s ? s.version : null;
+}
+
+exports.SemVer = SemVer;
+
+function SemVer(version, loose) {
+  if (version instanceof SemVer) {
+    if (version.loose === loose)
+      return version;
+    else
+      version = version.version;
+  } else if (typeof version !== 'string') {
+    throw new TypeError('Invalid Version: ' + version);
+  }
+
+  if (!(this instanceof SemVer))
+    return new SemVer(version, loose);
+
+  ;
+  this.loose = loose;
+  var m = version.trim().match(loose ? re[LOOSE] : re[FULL]);
+
+  if (!m)
+    throw new TypeError('Invalid Version: ' + version);
+
+  this.raw = version;
+
+  // these are actually numbers
+  this.major = +m[1];
+  this.minor = +m[2];
+  this.patch = +m[3];
+
+  // numberify any prerelease numeric ids
+  if (!m[4])
+    this.prerelease = [];
+  else
+    this.prerelease = m[4].split('.').map(function(id) {
+      return (/^[0-9]+$/.test(id)) ? +id : id;
+    });
+
+  this.build = m[5] ? m[5].split('.') : [];
+  this.format();
+}
+
+SemVer.prototype.format = function() {
+  this.version = this.major + '.' + this.minor + '.' + this.patch;
+  if (this.prerelease.length)
+    this.version += '-' + this.prerelease.join('.');
+  return this.version;
+};
+
+SemVer.prototype.inspect = function() {
+  return '<SemVer "' + this + '">';
+};
+
+SemVer.prototype.toString = function() {
+  return this.version;
+};
+
+SemVer.prototype.compare = function(other) {
+  ;
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
+
+  return this.compareMain(other) || this.comparePre(other);
+};
+
+SemVer.prototype.compareMain = function(other) {
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
+
+  return compareIdentifiers(this.major, other.major) ||
+         compareIdentifiers(this.minor, other.minor) ||
+         compareIdentifiers(this.patch, other.patch);
+};
+
+SemVer.prototype.comparePre = function(other) {
+  if (!(other instanceof SemVer))
+    other = new SemVer(other, this.loose);
+
+  // NOT having a prerelease is > having one
+  if (this.prerelease.length && !other.prerelease.length)
+    return -1;
+  else if (!this.prerelease.length && other.prerelease.length)
+    return 1;
+  else if (!this.prerelease.length && !other.prerelease.length)
+    return 0;
+
+  var i = 0;
+  do {
+    var a = this.prerelease[i];
+    var b = other.prerelease[i];
+    ;
+    if (a === undefined && b === undefined)
+      return 0;
+    else if (b === undefined)
+      return 1;
+    else if (a === undefined)
+      return -1;
+    else if (a === b)
+      continue;
+    else
+      return compareIdentifiers(a, b);
+  } while (++i);
+};
+
+// preminor will bump the version up to the next minor release, and immediately
+// down to pre-release. premajor and prepatch work the same way.
+SemVer.prototype.inc = function(release) {
+  switch (release) {
+    case 'premajor':
+      this.prerelease.length = 0;
+      this.patch = 0;
+      this.minor = 0;
+      this.major++;
+      this.inc('pre');
+      break;
+    case 'preminor':
+      this.prerelease.length = 0;
+      this.patch = 0;
+      this.minor++;
+      this.inc('pre');
+      break;
+    case 'prepatch':
+      // If this is already a prerelease, it will bump to the next version
+      // drop any prereleases that might already exist, since they are not
+      // relevant at this point.
+      this.prerelease.length = 0;
+      this.inc('patch');
+      this.inc('pre');
+      break;
+    // If the input is a non-prerelease version, this acts the same as
+    // prepatch.
+    case 'prerelease':
+      if (this.prerelease.length === 0)
+        this.inc('patch');
+      this.inc('pre');
+      break;
+
+    case 'major':
+      // If this is a pre-major version, bump up to the same major version.
+      // Otherwise increment major.
+      // 1.0.0-5 bumps to 1.0.0
+      // 1.1.0 bumps to 2.0.0
+      if (this.minor !== 0 || this.patch !== 0 || this.prerelease.length === 0)
+        this.major++;
+      this.minor = 0;
+      this.patch = 0;
+      this.prerelease = [];
+      break;
+    case 'minor':
+      // If this is a pre-minor version, bump up to the same minor version.
+      // Otherwise increment minor.
+      // 1.2.0-5 bumps to 1.2.0
+      // 1.2.1 bumps to 1.3.0
+      if (this.patch !== 0 || this.prerelease.length === 0)
+        this.minor++;
+      this.patch = 0;
+      this.prerelease = [];
+      break;
+    case 'patch':
+      // If this is not a pre-release version, it will increment the patch.
+      // If it is a pre-release it will bump up to the same patch version.
+      // 1.2.0-5 patches to 1.2.0
+      // 1.2.0 patches to 1.2.1
+      if (this.prerelease.length === 0)
+        this.patch++;
+      this.prerelease = [];
+      break;
+    // This probably shouldn't be used publicly.
+    // 1.0.0 "pre" would become 1.0.0 which is the wrong direction.
+    case 'pre':
+      if (this.prerelease.length === 0)
+        this.prerelease = [0];
+      else {
+        var i = this.prerelease.length;
+        while (--i >= 0) {
+          if (typeof this.prerelease[i] === 'number') {
+            this.prerelease[i]++;
+            i = -2;
+          }
+        }
+        if (i === -1) // didn't increment anything
+          this.prerelease.push(0);
+      }
+      break;
+
+    default:
+      throw new Error('invalid increment argument: ' + release);
+  }
+  this.format();
+  return this;
+};
+
+exports.inc = inc;
+function inc(version, release, loose) {
+  try {
+    return new SemVer(version, loose).inc(release).version;
+  } catch (er) {
+    return null;
+  }
+}
+
+exports.compareIdentifiers = compareIdentifiers;
+
+var numeric = /^[0-9]+$/;
+function compareIdentifiers(a, b) {
+  var anum = numeric.test(a);
+  var bnum = numeric.test(b);
+
+  if (anum && bnum) {
+    a = +a;
+    b = +b;
+  }
+
+  return (anum && !bnum) ? -1 :
+         (bnum && !anum) ? 1 :
+         a < b ? -1 :
+         a > b ? 1 :
+         0;
+}
+
+exports.rcompareIdentifiers = rcompareIdentifiers;
+function rcompareIdentifiers(a, b) {
+  return compareIdentifiers(b, a);
+}
+
+exports.compare = compare;
+function compare(a, b, loose) {
+  return new SemVer(a, loose).compare(b);
+}
+
+exports.compareLoose = compareLoose;
+function compareLoose(a, b) {
+  return compare(a, b, true);
+}
+
+exports.rcompare = rcompare;
+function rcompare(a, b, loose) {
+  return compare(b, a, loose);
+}
+
+exports.sort = sort;
+function sort(list, loose) {
+  return list.sort(function(a, b) {
+    return exports.compare(a, b, loose);
+  });
+}
+
+exports.rsort = rsort;
+function rsort(list, loose) {
+  return list.sort(function(a, b) {
+    return exports.rcompare(a, b, loose);
+  });
+}
+
+exports.gt = gt;
+function gt(a, b, loose) {
+  return compare(a, b, loose) > 0;
+}
+
+exports.lt = lt;
+function lt(a, b, loose) {
+  return compare(a, b, loose) < 0;
+}
+
+exports.eq = eq;
+function eq(a, b, loose) {
+  return compare(a, b, loose) === 0;
+}
+
+exports.neq = neq;
+function neq(a, b, loose) {
+  return compare(a, b, loose) !== 0;
+}
+
+exports.gte = gte;
+function gte(a, b, loose) {
+  return compare(a, b, loose) >= 0;
+}
+
+exports.lte = lte;
+function lte(a, b, loose) {
+  return compare(a, b, loose) <= 0;
+}
+
+exports.cmp = cmp;
+function cmp(a, op, b, loose) {
+  var ret;
+  switch (op) {
+    case '===':
+      if (typeof a === 'object') a = a.version;
+      if (typeof b === 'object') b = b.version;
+      ret = a === b;
+      break;
+    case '!==':
+      if (typeof a === 'object') a = a.version;
+      if (typeof b === 'object') b = b.version;
+      ret = a !== b;
+      break;
+    case '': case '=': case '==': ret = eq(a, b, loose); break;
+    case '!=': ret = neq(a, b, loose); break;
+    case '>': ret = gt(a, b, loose); break;
+    case '>=': ret = gte(a, b, loose); break;
+    case '<': ret = lt(a, b, loose); break;
+    case '<=': ret = lte(a, b, loose); break;
+    default: throw new TypeError('Invalid operator: ' + op);
+  }
+  return ret;
+}
+
+exports.Comparator = Comparator;
+function Comparator(comp, loose) {
+  if (comp instanceof Comparator) {
+    if (comp.loose === loose)
+      return comp;
+    else
+      comp = comp.value;
+  }
+
+  if (!(this instanceof Comparator))
+    return new Comparator(comp, loose);
+
+  ;
+  this.loose = loose;
+  this.parse(comp);
+
+  if (this.semver === ANY)
+    this.value = '';
+  else
+    this.value = this.operator + this.semver.version;
+
+  ;
+}
+
+var ANY = {};
+Comparator.prototype.parse = function(comp) {
+  var r = this.loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+  var m = comp.match(r);
+
+  if (!m)
+    throw new TypeError('Invalid comparator: ' + comp);
+
+  this.operator = m[1];
+  if (this.operator === '=')
+    this.operator = '';
+
+  // if it literally is just '>' or '' then allow anything.
+  if (!m[2])
+    this.semver = ANY;
+  else
+    this.semver = new SemVer(m[2], this.loose);
+};
+
+Comparator.prototype.inspect = function() {
+  return '<SemVer Comparator "' + this + '">';
+};
+
+Comparator.prototype.toString = function() {
+  return this.value;
+};
+
+Comparator.prototype.test = function(version) {
+  ;
+
+  if (this.semver === ANY)
+    return true;
+
+  if (typeof version === 'string')
+    version = new SemVer(version, this.loose);
+
+  return cmp(version, this.operator, this.semver, this.loose);
+};
+
+
+exports.Range = Range;
+function Range(range, loose) {
+  if ((range instanceof Range) && range.loose === loose)
+    return range;
+
+  if (!(this instanceof Range))
+    return new Range(range, loose);
+
+  this.loose = loose;
+
+  // First, split based on boolean or ||
+  this.raw = range;
+  this.set = range.split(/\s*\|\|\s*/).map(function(range) {
+    return this.parseRange(range.trim());
+  }, this).filter(function(c) {
+    // throw out any that are not relevant for whatever reason
+    return c.length;
+  });
+
+  if (!this.set.length) {
+    throw new TypeError('Invalid SemVer Range: ' + range);
+  }
+
+  this.format();
+}
+
+Range.prototype.inspect = function() {
+  return '<SemVer Range "' + this.range + '">';
+};
+
+Range.prototype.format = function() {
+  this.range = this.set.map(function(comps) {
+    return comps.join(' ').trim();
+  }).join('||').trim();
+  return this.range;
+};
+
+Range.prototype.toString = function() {
+  return this.range;
+};
+
+Range.prototype.parseRange = function(range) {
+  var loose = this.loose;
+  range = range.trim();
+  ;
+  // `1.2.3 - 1.2.4` => `>=1.2.3 <=1.2.4`
+  var hr = loose ? re[HYPHENRANGELOOSE] : re[HYPHENRANGE];
+  range = range.replace(hr, hyphenReplace);
+  ;
+  // `> 1.2.3 < 1.2.5` => `>1.2.3 <1.2.5`
+  range = range.replace(re[COMPARATORTRIM], comparatorTrimReplace);
+  ;
+
+  // `~ 1.2.3` => `~1.2.3`
+  range = range.replace(re[TILDETRIM], tildeTrimReplace);
+
+  // `^ 1.2.3` => `^1.2.3`
+  range = range.replace(re[CARETTRIM], caretTrimReplace);
+
+  // normalize spaces
+  range = range.split(/\s+/).join(' ');
+
+  // At this point, the range is completely trimmed and
+  // ready to be split into comparators.
+
+  var compRe = loose ? re[COMPARATORLOOSE] : re[COMPARATOR];
+  var set = range.split(' ').map(function(comp) {
+    return parseComparator(comp, loose);
+  }).join(' ').split(/\s+/);
+  if (this.loose) {
+    // in loose mode, throw out any that are not valid comparators
+    set = set.filter(function(comp) {
+      return !!comp.match(compRe);
+    });
+  }
+  set = set.map(function(comp) {
+    return new Comparator(comp, loose);
+  });
+
+  return set;
+};
+
+// Mostly just for testing and legacy API reasons
+exports.toComparators = toComparators;
+function toComparators(range, loose) {
+  return new Range(range, loose).set.map(function(comp) {
+    return comp.map(function(c) {
+      return c.value;
+    }).join(' ').trim().split(' ');
+  });
+}
+
+// comprised of xranges, tildes, stars, and gtlt's at this point.
+// already replaced the hyphen ranges
+// turn into a set of JUST comparators.
+function parseComparator(comp, loose) {
+  ;
+  comp = replaceCarets(comp, loose);
+  ;
+  comp = replaceTildes(comp, loose);
+  ;
+  comp = replaceXRanges(comp, loose);
+  ;
+  comp = replaceStars(comp, loose);
+  ;
+  return comp;
+}
+
+function isX(id) {
+  return !id || id.toLowerCase() === 'x' || id === '*';
+}
+
+// ~, ~> --> * (any, kinda silly)
+// ~2, ~2.x, ~2.x.x, ~>2, ~>2.x ~>2.x.x --> >=2.0.0 <3.0.0
+// ~2.0, ~2.0.x, ~>2.0, ~>2.0.x --> >=2.0.0 <2.1.0
+// ~1.2, ~1.2.x, ~>1.2, ~>1.2.x --> >=1.2.0 <1.3.0
+// ~1.2.3, ~>1.2.3 --> >=1.2.3 <1.3.0
+// ~1.2.0, ~>1.2.0 --> >=1.2.0 <1.3.0
+function replaceTildes(comp, loose) {
+  return comp.trim().split(/\s+/).map(function(comp) {
+    return replaceTilde(comp, loose);
+  }).join(' ');
+}
+
+function replaceTilde(comp, loose) {
+  var r = loose ? re[TILDELOOSE] : re[TILDE];
+  return comp.replace(r, function(_, M, m, p, pr) {
+    ;
+    var ret;
+
+    if (isX(M))
+      ret = '';
+    else if (isX(m))
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+    else if (isX(p))
+      // ~1.2 == >=1.2.0- <1.3.0-
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+    else if (pr) {
+      ;
+      if (pr.charAt(0) !== '-')
+        pr = '-' + pr;
+      ret = '>=' + M + '.' + m + '.' + p + pr +
+            ' <' + M + '.' + (+m + 1) + '.0';
+    } else
+      // ~1.2.3 == >=1.2.3 <1.3.0
+      ret = '>=' + M + '.' + m + '.' + p +
+            ' <' + M + '.' + (+m + 1) + '.0';
+
+    ;
+    return ret;
+  });
+}
+
+// ^ --> * (any, kinda silly)
+// ^2, ^2.x, ^2.x.x --> >=2.0.0 <3.0.0
+// ^2.0, ^2.0.x --> >=2.0.0 <3.0.0
+// ^1.2, ^1.2.x --> >=1.2.0 <2.0.0
+// ^1.2.3 --> >=1.2.3 <2.0.0
+// ^1.2.0 --> >=1.2.0 <2.0.0
+function replaceCarets(comp, loose) {
+  return comp.trim().split(/\s+/).map(function(comp) {
+    return replaceCaret(comp, loose);
+  }).join(' ');
+}
+
+function replaceCaret(comp, loose) {
+  ;
+  var r = loose ? re[CARETLOOSE] : re[CARET];
+  return comp.replace(r, function(_, M, m, p, pr) {
+    ;
+    var ret;
+
+    if (isX(M))
+      ret = '';
+    else if (isX(m))
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+    else if (isX(p)) {
+      if (M === '0')
+        ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+      else
+        ret = '>=' + M + '.' + m + '.0 <' + (+M + 1) + '.0.0';
+    } else if (pr) {
+      ;
+      if (pr.charAt(0) !== '-')
+        pr = '-' + pr;
+      if (M === '0') {
+        if (m === '0')
+          ret = '>=' + M + '.' + m + '.' + p + pr +
+                ' <' + M + '.' + m + '.' + (+p + 1);
+        else
+          ret = '>=' + M + '.' + m + '.' + p + pr +
+                ' <' + M + '.' + (+m + 1) + '.0';
+      } else
+        ret = '>=' + M + '.' + m + '.' + p + pr +
+              ' <' + (+M + 1) + '.0.0';
+    } else {
+      ;
+      if (M === '0') {
+        if (m === '0')
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + m + '.' + (+p + 1);
+        else
+          ret = '>=' + M + '.' + m + '.' + p +
+                ' <' + M + '.' + (+m + 1) + '.0';
+      } else
+        ret = '>=' + M + '.' + m + '.' + p +
+              ' <' + (+M + 1) + '.0.0';
+    }
+
+    ;
+    return ret;
+  });
+}
+
+function replaceXRanges(comp, loose) {
+  ;
+  return comp.split(/\s+/).map(function(comp) {
+    return replaceXRange(comp, loose);
+  }).join(' ');
+}
+
+function replaceXRange(comp, loose) {
+  comp = comp.trim();
+  var r = loose ? re[XRANGELOOSE] : re[XRANGE];
+  return comp.replace(r, function(ret, gtlt, M, m, p, pr) {
+    ;
+    var xM = isX(M);
+    var xm = xM || isX(m);
+    var xp = xm || isX(p);
+    var anyX = xp;
+
+    if (gtlt === '=' && anyX)
+      gtlt = '';
+
+    if (gtlt && anyX) {
+      // replace X with 0
+      if (xM)
+        M = 0;
+      if (xm)
+        m = 0;
+      if (xp)
+        p = 0;
+
+      if (gtlt === '>') {
+        // >1 => >=2.0.0
+        // >1.2 => >=1.3.0
+        // >1.2.3 => >= 1.2.4
+        gtlt = '>=';
+        if (xM) {
+          // no change
+        } else if (xm) {
+          M = +M + 1;
+          m = 0;
+          p = 0;
+        } else if (xp) {
+          m = +m + 1;
+          p = 0;
+        }
+      }
+
+
+      ret = gtlt + M + '.' + m + '.' + p;
+    } else if (xM) {
+      // allow any
+      ret = '*';
+    } else if (xm) {
+      ret = '>=' + M + '.0.0 <' + (+M + 1) + '.0.0';
+    } else if (xp) {
+      ret = '>=' + M + '.' + m + '.0 <' + M + '.' + (+m + 1) + '.0';
+    }
+
+    ;
+
+    return ret;
+  });
+}
+
+// Because * is AND-ed with everything else in the comparator,
+// and '' means "any version", just remove the *s entirely.
+function replaceStars(comp, loose) {
+  ;
+  // Looseness is ignored here.  star is always as loose as it gets!
+  return comp.trim().replace(re[STAR], '');
+}
+
+// This function is passed to string.replace(re[HYPHENRANGE])
+// M, m, patch, prerelease, build
+// 1.2 - 3.4.5 => >=1.2.0 <=3.4.5
+// 1.2.3 - 3.4 => >=1.2.0 <3.5.0 Any 3.4.x will do
+// 1.2 - 3.4 => >=1.2.0 <3.5.0
+function hyphenReplace($0,
+                       from, fM, fm, fp, fpr, fb,
+                       to, tM, tm, tp, tpr, tb) {
+
+  if (isX(fM))
+    from = '';
+  else if (isX(fm))
+    from = '>=' + fM + '.0.0';
+  else if (isX(fp))
+    from = '>=' + fM + '.' + fm + '.0';
+  else
+    from = '>=' + from;
+
+  if (isX(tM))
+    to = '';
+  else if (isX(tm))
+    to = '<' + (+tM + 1) + '.0.0';
+  else if (isX(tp))
+    to = '<' + tM + '.' + (+tm + 1) + '.0';
+  else if (tpr)
+    to = '<=' + tM + '.' + tm + '.' + tp + '-' + tpr;
+  else
+    to = '<=' + to;
+
+  return (from + ' ' + to).trim();
+}
+
+
+// if ANY of the sets match ALL of its comparators, then pass
+Range.prototype.test = function(version) {
+  if (!version)
+    return false;
+
+  if (typeof version === 'string')
+    version = new SemVer(version, this.loose);
+
+  for (var i = 0; i < this.set.length; i++) {
+    if (testSet(this.set[i], version))
+      return true;
+  }
+  return false;
+};
+
+function testSet(set, version) {
+  for (var i = 0; i < set.length; i++) {
+    if (!set[i].test(version))
+      return false;
+  }
+
+  if (version.prerelease.length) {
+    // Find the set of versions that are allowed to have prereleases
+    // For example, ^1.2.3-pr.1 desugars to >=1.2.3-pr.1 <2.0.0
+    // That should allow `1.2.3-pr.2` to pass.
+    // However, `1.2.4-alpha.notready` should NOT be allowed,
+    // even though it's within the range set by the comparators.
+    for (var i = 0; i < set.length; i++) {
+      ;
+      if (set[i].semver === ANY)
+        return true;
+
+      if (set[i].semver.prerelease.length > 0) {
+        var allowed = set[i].semver;
+        if (allowed.major === version.major &&
+            allowed.minor === version.minor &&
+            allowed.patch === version.patch)
+          return true;
+      }
+    }
+
+    // Version has a -pre, but it's not one of the ones we like.
+    return false;
+  }
+
+  return true;
+}
+
+exports.satisfies = satisfies;
+function satisfies(version, range, loose) {
+  try {
+    range = new Range(range, loose);
+  } catch (er) {
+    return false;
+  }
+  return range.test(version);
+}
+
+exports.maxSatisfying = maxSatisfying;
+function maxSatisfying(versions, range, loose) {
+  return versions.filter(function(version) {
+    return satisfies(version, range, loose);
+  }).sort(function(a, b) {
+    return rcompare(a, b, loose);
+  })[0] || null;
+}
+
+exports.validRange = validRange;
+function validRange(range, loose) {
+  try {
+    // Return '*' instead of '' so that truthiness works.
+    // This will throw if it's invalid anyway
+    return new Range(range, loose).range || '*';
+  } catch (er) {
+    return null;
+  }
+}
+
+// Determine if version is less than all the versions possible in the range
+exports.ltr = ltr;
+function ltr(version, range, loose) {
+  return outside(version, range, '<', loose);
+}
+
+// Determine if version is greater than all the versions possible in the range.
+exports.gtr = gtr;
+function gtr(version, range, loose) {
+  return outside(version, range, '>', loose);
+}
+
+exports.outside = outside;
+function outside(version, range, hilo, loose) {
+  version = new SemVer(version, loose);
+  range = new Range(range, loose);
+
+  var gtfn, ltefn, ltfn, comp, ecomp;
+  switch (hilo) {
+    case '>':
+      gtfn = gt;
+      ltefn = lte;
+      ltfn = lt;
+      comp = '>';
+      ecomp = '>=';
+      break;
+    case '<':
+      gtfn = lt;
+      ltefn = gte;
+      ltfn = gt;
+      comp = '<';
+      ecomp = '<=';
+      break;
+    default:
+      throw new TypeError('Must provide a hilo val of "<" or ">"');
+  }
+
+  // If it satisifes the range it is not outside
+  if (satisfies(version, range, loose)) {
+    return false;
+  }
+
+  // From now on, variable terms are as if we're in "gtr" mode.
+  // but note that everything is flipped for the "ltr" function.
+
+  for (var i = 0; i < range.set.length; ++i) {
+    var comparators = range.set[i];
+
+    var high = null;
+    var low = null;
+
+    comparators.forEach(function(comparator) {
+      high = high || comparator;
+      low = low || comparator;
+      if (gtfn(comparator.semver, high.semver, loose)) {
+        high = comparator;
+      } else if (ltfn(comparator.semver, low.semver, loose)) {
+        low = comparator;
+      }
+    });
+
+    // If the edge version comparator has a operator then our version
+    // isn't outside it
+    if (high.operator === comp || high.operator === ecomp) {
+      return false;
+    }
+
+    // If the lowest version comparator has an operator and our version
+    // is less than it then it isn't higher than the range
+    if ((!low.operator || low.operator === comp) &&
+        ltefn(version, low.semver)) {
+      return false;
+    } else if (low.operator === ecomp && ltfn(version, low.semver)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// Use the define() function if we're in AMD land
+if (typeof define === 'function' && define.amd)
+  define(exports);
+
+})(
+  typeof exports === 'object' ? exports :
+  typeof define === 'function' && define.amd ? {} :
+  semver = {}
+);
diff --git a/lib/datastore/dataset.js b/lib/datastore/dataset.js
index 4ff7916edded..6cab28396063 100644
--- a/lib/datastore/dataset.js
+++ b/lib/datastore/dataset.js
@@ -20,6 +20,8 @@
 
 'use strict';
 
+var nodeutil = require('util');
+
 /**
  * @type module:common/connection
  * @private
@@ -32,12 +34,6 @@ var conn = require('../common/connection.js');
  */
 var entity = require('./entity.js');
 
-/**
- * @type module:datastore/pb
- * @private
- */
-var pb = require('./pb.js');
-
 /**
  * @type module:datastore/query
  * @private
@@ -56,6 +52,12 @@ var Transaction = require('./transaction.js');
  */
 var util = require('../common/util.js');
 
+/**
+ * @type module:datastore/request
+ * @private
+ */
+var DatastoreRequest = require('./request.js');
+
 /**
  * Scopes for Google Datastore access.
  * @const {array} SCOPES
@@ -72,8 +74,9 @@ var SCOPES = [
  *
  * @constructor
  * @alias module:datastore/dataset
+ * @mixes module:datastore/request
  *
- * @param {object=} options
+ * @param {object=} options - Configuration object.
  * @param {string=} options.projectId - Dataset ID. This is your project ID from
  *     the Google Developers Console.
  * @param {string=} options.keyFilename - Full path to the JSON key downloaded
@@ -101,11 +104,13 @@ function Dataset(options) {
     keyFilename: options.keyFilename,
     scopes: SCOPES
   });
+
   this.projectId = options.projectId;
   this.namespace = options.namespace;
-  this.transaction = this.createTransaction_();
 }
 
+nodeutil.inherits(Dataset, DatastoreRequest);
+
 /**
  * Helper to create a Key object, scoped to the dataset's namespace by default.
  *
@@ -135,6 +140,8 @@ function Dataset(options) {
  *   namespace: 'My-NS',
  *   path: ['Company', 123]
  * });
+ *
+ * @return {Key} A newly created Key from the options given.
  */
 Dataset.prototype.key = function(options) {
   options = util.is(options, 'object') ? options : {
@@ -144,7 +151,6 @@ Dataset.prototype.key = function(options) {
   return new entity.Key(options);
 };
 
-
 /**
  * Create a query from the current dataset to query the specified kinds, scoped
  * to the namespace provided at the initialization of the dataset.
@@ -166,143 +172,6 @@ Dataset.prototype.createQuery = function(namespace, kinds) {
   return new Query(namespace, util.arrayize(kinds));
 };
 
-/**
- * Retrieve the entities identified with the specified key(s) in the current
- * transaction. Get operations require a valid key to retrieve the
- * key-identified entity from Datastore.
- *
- * @borrows {module:datastore/transaction#get} as get
- *
- * @param {Key|Key[]} key - Datastore key object(s).
- * @param {function} callback - The callback function.
- *
- * @example
- * dataset.get([
- *   dataset.key(['Company', 123]),
- *   dataset.key(['Product', 'Computer'])
- * ], function(err, entities) {});
- */
-Dataset.prototype.get = function(key, callback) {
-  this.transaction.get(key, callback);
-};
-
-/**
- * Insert or update the specified object(s) in the current transaction. If a key
- * is incomplete, its associated object is inserted and its generated identifier
- * is returned to the callback.
- *
- * This method will determine the correct Datastore method to execute (`upsert`,
- * `insert`, `update`, and `insertAutoId`) by using the key(s) provided. For
- * example, if you provide an incomplete key (one without an ID), the request
- * will create a new entity and have its ID automatically assigned. If you
- * provide a complete key, the entity will be updated with the data specified.
- *
- * By default, all properties are indexed. To prevent a property from being
- * included in *all* indexes, you must supply an entity's `data` property as an
- * array. See below for an example.
- *
- * @borrows {module:datastore/transaction#save} as save
- *
- * @param {object|object[]} entities - Datastore key object(s).
- * @param {Key} entities.key - Datastore key object.
- * @param {object|object[]} entities.data - Data to save with the provided key.
- *     If you provide an array of objects, you must use the explicit syntax:
- *     `name` for the name of the property and `value` for its value. You may
- *     also specify an `excludeFromIndexes` property, set to `true` or `false`.
- * @param {function} callback - The callback function.
- *
- * @example
- * // Save a single entity.
- * dataset.save({
- *   key: dataset.key('Company'),
- *   data: {
- *     rating: '10'
- *   }
- * }, function(err, key) {
- *   // Because we gave an incomplete key as an argument, `key` will be
- *   // populated with the complete, generated key.
- * });
- *
- * // To specify an `excludeFromIndexes` value for a Datastore entity, pass in
- * // an array for the key's data. The above example would then look like:
- * transaction.save({
- *   key: dataset.key('Company'),
- *   data: [
- *     {
- *       name: 'rating',
- *       value: '10',
- *       excludeFromIndexes: false
- *     }
- *   ]
- * }, function(err, key) {});
- *
- * // Save multiple entities at once.
- * dataset.save([
- *   {
- *     key: dataset.key(['Company', 123]),
- *     data: {
- *       HQ: 'Dallas, TX'
- *     }
- *   },
- *   {
- *     key: dataset.key(['Product', 'Computer']),
- *     data: {
- *       vendor: 'Dell'
- *     }
- *   }
- * ], function(err, keys) {});
- */
-Dataset.prototype.save = function(key, obj, callback) {
-  this.transaction.save(key, obj, callback);
-};
-
-/**
- * Delete all entities identified with the specified key(s) in the current
- * transaction.
- *
- * @param {Key|Key[]} key - Datastore key object(s).
- * @param {function} callback - The callback function.
- *
- * @borrows {module:datastore/transaction#delete} as delete
- *
- * @example
- * // Delete a single entity.
- * dataset.delete(dataset.key(['Company', 123]), function(err) {});
- *
- * // Delete multiple entities at once.
- * dataset.delete([
- *   dataset.key(['Company', 123]),
- *   dataset.key(['Product', 'Computer'])
- * ], function(err) {});
- */
-Dataset.prototype.delete = function(key, callback) {
-  this.transaction.delete(key, callback);
-};
-
-/**
- * Datastore allows you to query entities by kind, filter them by property
- * filters, and sort them by a property name. Projection and pagination are also
- * supported. If more results are available, a query to retrieve the next page
- * is provided to the callback function.
- *
- * @borrows {module:datastore/transaction#runQuery} as runQuery
- *
- * @param {module:datastore/query} query - Query object.
- * @param {function} callback - The callback function.
- *
- * @example
- * // Retrieve 5 companies.
- * dataset.runQuery(queryObject, function(err, entities, nextQuery) {
- *   // `nextQuery` is not null if there are more results.
- *   if (nextQuery) {
- *     dataset.runQuery(nextQuery, function(err, entities, nextQuery) {});
- *   }
- * });
- */
-Dataset.prototype.runQuery = function(q, callback) {
-  this.transaction.runQuery(q, callback);
-};
-
 /**
  * Run a function in the context of a new transaction. Transactions allow you to
  * perform multiple operations, committing your changes atomically.
@@ -337,53 +206,6 @@ Dataset.prototype.runInTransaction = function(fn, callback) {
   });
 };
 
-/**
- * Generate IDs without creating entities.
- *
- * @param {Key} incompleteKey - The key object to complete.
- * @param {number} n - How many IDs to generate.
- * @param {function} callback - The callback function.
- *
- * @example
- * // The following call will create 100 new IDs from the Company kind, which
- * // exists under the default namespace.
- * var incompleteKey = dataset.key('Company');
- * dataset.allocateIds(incompleteKey, 100, function(err, keys) {});
- *
- * // You may prefer to create IDs from a non-default namespace by providing an
- * // incomplete key with a namespace. Similar to the previous example, the call
- * // below will create 100 new IDs, but from the Company kind that exists under
- * // the "ns-test" namespace.
- * var incompleteKey = dataset.key({
- *   namespace: 'ns-test',
- *   path: ['Company']
- * });
- * dataset.allocateIds(incompleteKey, 100, function(err, keys) {});
- */
-Dataset.prototype.allocateIds = function(incompleteKey, n, callback) {
-  if (entity.isKeyComplete(incompleteKey)) {
-    throw new Error('An incomplete key should be provided.');
-  }
-  var incompleteKeys = [];
-  for (var i = 0; i < n; i++) {
-    incompleteKeys.push(entity.keyToKeyProto(incompleteKey));
-  }
-  this.transaction.makeReq(
-      'allocateIds',
-      new pb.AllocateIdsRequest({ key: incompleteKeys }),
-      pb.AllocateIdsResponse, function(err, resp) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    var keys = [];
-    (resp.key || []).forEach(function(k) {
-      keys.push(entity.keyFromKeyProto(k));
-    });
-    callback(null ,keys);
-  });
-};
-
 /**
  * Create a new Transaction object using the existing connection and dataset.
  *
diff --git a/lib/datastore/request.js b/lib/datastore/request.js
new file mode 100644
index 000000000000..3f7e32774949
--- /dev/null
+++ b/lib/datastore/request.js
@@ -0,0 +1,474 @@
+/*!
+ * Copyright 2014 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*!
+ * @module datastore/request
+ */
+
+'use strict';
+
+var https = require('https');
+
+/**
+ * @type module:datastore/entity
+ * @private
+ */
+var entity = require('./entity.js');
+
+/**
+ * @type module:datastore/pb
+ * @private
+ */
+var pb = require('./pb.js');
+
+/**
+ * @type module:common/util
+ * @private
+ */
+var util = require('../common/util.js');
+
+/**
+ * @const {string} Host to send with API requests.
+ * @private
+ */
+var GOOGLE_APIS_HOST = 'www.googleapis.com';
+
+/**
+ * @const {string} Non-transaction mode key.
+ * @private
+ */
+var MODE_NON_TRANSACTIONAL = 'NON_TRANSACTIONAL';
+
+/**
+ * @const {string} Transaction mode key.
+ * @private
+ */
+var MODE_TRANSACTIONAL = 'TRANSACTIONAL';
+
+/*! Developer Documentation
+ *
+ * Handles request logic for Datastore.
+ *
+ * Creates requests to the Dataset endpoint. Designed to be inherited by
+ * datastore.Dataset and datastore.Transaction objects.
+ *
+ * @example
+ * // Inherit in Dataset and Transaction
+ * require('util').inherits(Dataset, DatastoreRequest);
+ * require('util').inherits(Transaction, DatastoreRequest);
+ */
+/*
+ * Handle logic for Datastore API operations.
+ *
+ * @constructor
+ * @alias module:datastore/request
+ * @mixin
+ */
+function DatastoreRequest() {}
+
+/**
+ * Retrieve the entities identified with the specified key(s) in the current
+ * transaction. Get operations require a valid key to retrieve the
+ * key-identified entity from Datastore.
+ *
+ * @param {Key|Key[]} keys - Datastore key object(s).
+ * @param {function} callback - The callback function.
+ *
+ * @example
+ * //-
+ * // Where you see `transaction`, assume this is the context that's relevant to
+ * // your use, whether that be a Dataset or Transaction object.
+ * //-
+ *
+ * // Get a single entity.
+ * transaction.get(dataset.key(['Company', 123]), function(err, entity) {});
+ *
+ * // Get multiple entities at once.
+ * transaction.get([
+ *   dataset.key(['Company', 123]),
+ *   dataset.key(['Product', 'Computer'])
+ * ], function(err, entities) {});
+ */
+DatastoreRequest.prototype.get = function(keys, callback) {
+  var isMultipleRequest = Array.isArray(keys);
+  keys = isMultipleRequest ? keys : [keys];
+  callback = callback || util.noop;
+  var req = new pb.LookupRequest({
+    key: keys.map(entity.keyToKeyProto)
+  });
+  var res = pb.LookupResponse;
+  if (this.id) {
+    req.transaction = this.id;
+  }
+  this.createRequest_('lookup', req, res, function(err, resp) {
+    if (err) {
+      callback(err);
+      return;
+    }
+    var found = entity.formatArray(resp.found);
+    if (isMultipleRequest && resp.deferred && resp.deferred.length) {
+      // There may be more results. Call `.get` again, and append the results.
+      this.get(
+          resp.deferred.map(entity.keyFromKeyProto), function(err, entities) {
+        if (err) {
+          callback(err);
+          return;
+        }
+        if (resp) {
+          found = (found || []).concat(entities);
+        }
+        callback(null, found);
+      });
+      return;
+    }
+    callback(null, isMultipleRequest ? found : found[0]);
+  }.bind(this));
+};
+
+/**
+ * Insert or update the specified object(s) in the current transaction. If a key
+ * is incomplete, its associated object is inserted and its generated identifier
+ * is returned to the callback.
+ *
+ * This method will determine the correct Datastore method to execute (`upsert`,
+ * `insert`, `update`, and `insertAutoId`) by using the key(s) provided. For
+ * example, if you provide an incomplete key (one without an ID), the request
+ * will create a new entity and have its ID automatically assigned. If you
+ * provide a complete key, the entity will be updated with the data specified.
+ *
+ * By default, all properties are indexed. To prevent a property from being
+ * included in *all* indexes, you must supply an entity's `data` property as an
+ * array. See below for an example.
+ *
+ * @borrows {module:datastore/transaction#save} as save
+ *
+ * @param {object|object[]} entities - Datastore key object(s).
+ * @param {Key} entities.key - Datastore key object.
+ * @param {object|object[]} entities.data - Data to save with the provided key.
+ *     If you provide an array of objects, you must use the explicit syntax:
+ *     `name` for the name of the property and `value` for its value. You may
+ *     also specify an `excludeFromIndexes` property, set to `true` or `false`.
+ * @param {function} callback - The callback function.
+ *
+ * @example
+ * //-
+ * // Where you see `transaction`, assume this is the context that's relevant to
+ * // your use, whether that be a Dataset or a Transaction object.
+ * //-
+ *
+ * // Save a single entity.
+ * transaction.save({
+ *   key: dataset.key('Company'),
+ *   data: {
+ *     rating: '10'
+ *   }
+ * }, function(err, key) {
+ *   // Because we gave an incomplete key as an argument, `key` will be
+ *   // populated with the complete, generated key.
+ * });
+ *
+ * // To specify an `excludeFromIndexes` value for a Datastore entity, pass in
+ * // an array for the key's data. The above example would then look like:
+ * transaction.save({
+ *   key: dataset.key('Company'),
+ *   data: [
+ *     {
+ *       name: 'rating',
+ *       value: '10',
+ *       excludeFromIndexes: false
+ *     }
+ *   ]
+ * }, function(err, key) {});
+ *
+ * // Save multiple entities at once.
+ * transaction.save([
+ *   {
+ *     key: dataset.key(['Company', 123]),
+ *     data: {
+ *       HQ: 'Dallas, TX'
+ *     }
+ *   },
+ *   {
+ *     key: dataset.key(['Product', 'Computer']),
+ *     data: {
+ *       vendor: 'Dell'
+ *     }
+ *   }
+ * ], function(err, keys) {});
+ */
+DatastoreRequest.prototype.save = function(entities, callback) {
+  var isMultipleRequest = Array.isArray(entities);
+  entities = isMultipleRequest ? entities : [entities];
+  var insertIndexes = [];
+  var keys = entities.map(function(entityObject) {
+    return entityObject.key;
+  });
+  var req = {
+    mode: MODE_NON_TRANSACTIONAL,
+    mutation: entities.reduce(function(acc, entityObject, index) {
+      var ent = {};
+      if (Array.isArray(entityObject.data)) {
+        ent.property = entityObject.data.map(function(data) {
+          data.value = entity.valueToProperty(data.value);
+          if (util.is(data.excludeFromIndexes, 'boolean')) {
+            data.value.indexed = !data.excludeFromIndexes;
+            delete data.excludeFromIndexes;
+          }
+          return data;
+        });
+      } else {
+        ent = entity.entityToEntityProto(entityObject.data);
+      }
+      ent.key = entity.keyToKeyProto(entityObject.key);
+      if (entity.isKeyComplete(entityObject.key)) {
+        acc.upsert.push(ent);
+      } else {
+        insertIndexes.push(index);
+        acc.insert_auto_id.push(ent);
+      }
+      return acc;
+    }.bind(this), { upsert: [], insert_auto_id: [] })
+  };
+  if (this.id) {
+    req.transaction = this.id;
+    req.mode = MODE_TRANSACTIONAL;
+  }
+  req = new pb.CommitRequest(req);
+  var res = pb.CommitResponse;
+  this.createRequest_('commit', req, res, function(err, resp) {
+    if (err || !resp) {
+      callback(err);
+      return;
+    }
+    var autoInserted = (resp.mutation_result.insert_auto_id_key || []);
+    autoInserted.forEach(function(key, index) {
+      keys[insertIndexes[index]] = entity.keyFromKeyProto(key);
+    });
+    callback(null, isMultipleRequest ? keys : keys[0]);
+  });
+};
+
+/**
+ * Delete all entities identified with the specified key(s) in the current
+ * transaction.
+ *
+ * @param {Key|Key[]} key - Datastore key object(s).
+ * @param {function} callback - The callback function.
+ *
+ * @example
+ * //-
+ * // Where you see `transaction`, assume this is the context that's relevant to
+ * // your use, whether that be a Dataset or a Transaction object.
+ * //-
+ *
+ * // Delete a single entity.
+ * transaction.delete(dataset.key(['Company', 123]), function(err) {});
+ *
+ * // Delete multiple entities at once.
+ * transaction.delete([
+ *   dataset.key(['Company', 123]),
+ *   dataset.key(['Product', 'Computer'])
+ * ], function(err) {});
+ */
+DatastoreRequest.prototype.delete = function(keys, callback) {
+  var isMultipleRequest = Array.isArray(keys);
+  keys = isMultipleRequest ? keys : [keys];
+  callback = callback || util.noop;
+
+  var req = {
+    mode: MODE_NON_TRANSACTIONAL,
+    mutation: {
+      delete: keys.map(entity.keyToKeyProto)
+    }
+  };
+  if (this.id) {
+    req.transaction = this.id;
+    req.mode = MODE_TRANSACTIONAL;
+  }
+  req = new pb.CommitRequest(req);
+  var res = pb.CommitResponse;
+  this.createRequest_('commit', req, res, callback);
+};
+
+/**
+ * Datastore allows you to query entities by kind, filter them by property
+ * filters, and sort them by a property name. Projection and pagination are also
+ * supported. If more results are available, a query to retrieve the next page
+ * is provided to the callback function.
+ *
+ * @param {module:datastore/query} q - Query object.
+ * @param {function} callback - The callback function.
+ *
+ * @example
+ * //-
+ * // Where you see `transaction`, assume this is the context that's relevant to
+ * // your use, whether that be a Dataset or a Transaction object.
+ * //-
+ *
+ * // Retrieve 5 companies.
+ * transaction.runQuery(queryObject, function(err, entities, nextQuery) {
+ *   // `nextQuery` is not null if there are more results.
+ *   if (nextQuery) {
+ *     transaction.runQuery(nextQuery, function(err, entities, nextQuery) {});
+ *   }
+ * });
+ */
+
+DatastoreRequest.prototype.runQuery = function(q, callback) {
+  callback = callback || util.noop;
+  var req = {
+    read_options: {},
+    query: entity.queryToQueryProto(q)
+  };
+
+  if (this.id) {
+    req.read_options.transaction = this.id;
+  }
+
+  if (q.namespace) {
+    req.partition_id = {
+      namespace: q.namespace
+    };
+  }
+
+  req = new pb.RunQueryRequest(req);
+  var res = pb.RunQueryResponse;
+
+  this.createRequest_('runQuery', req, res, function(err, resp) {
+    if (err || !resp.batch || !resp.batch.entity_result) {
+      callback(err);
+      return;
+    }
+    var nextQuery = null;
+    if (resp.batch.end_cursor) {
+      var cursor = resp.batch.end_cursor.toBase64();
+      if (cursor !== q.startVal) {
+        nextQuery = q.start(cursor).offset(0);
+      }
+    }
+    callback(null, entity.formatArray(resp.batch.entity_result), nextQuery);
+  });
+};
+
+/**
+ * Generate IDs without creating entities.
+ *
+ * @param {Key} incompleteKey - The key object to complete.
+ * @param {number} n - How many IDs to generate.
+ * @param {function} callback - The callback function.
+ *
+ * @example
+ * //-
+ * // Where you see `transaction`, assume this is the context that's relevant to
+ * // your use, whether that be a Dataset or a Transaction object.
+ * //-
+ *
+ * // The following call will create 100 new IDs from the Company kind, which
+ * // exists under the default namespace.
+ * transaction.allocateIds(incompleteKey, 100, function(err, keys) {});
+ *
+ * // You may prefer to create IDs from a non-default namespace by providing an
+ * // incomplete key with a namespace. Similar to the previous example, the call
+ * // below will create 100 new IDs, but from the Company kind that exists under
+ * // the "ns-test" namespace.
+ * var incompleteKey = dataset.key({
+ *   namespace: 'ns-test',
+ *   path: ['Company']
+ * });
+ * transaction.allocateIds(incompleteKey, 100, function(err, keys) {});
+ */
+DatastoreRequest.prototype.allocateIds = function(incompleteKey, n, callback) {
+  if (entity.isKeyComplete(incompleteKey)) {
+    throw new Error('An incomplete key should be provided.');
+  }
+  var incompleteKeys = [];
+  for (var i = 0; i < n; i++) {
+    incompleteKeys.push(entity.keyToKeyProto(incompleteKey));
+  }
+
+  this.createRequest_(
+      'allocateIds',
+      new pb.AllocateIdsRequest({ key: incompleteKeys }),
+      pb.AllocateIdsResponse, function(err, resp) {
+    if (err) {
+      callback(err);
+      return;
+    }
+    var keys = [];
+    (resp.key || []).forEach(function(k) {
+      keys.push(entity.keyFromKeyProto(k));
+    });
+    callback(null, keys);
+  });
+};
+
+/**
+ * Make a request to the API endpoint.
+ *
+ * @param {string} method - Transaction action (allocateIds, commit, etc.).
+ * @param {object} req - Request configuration object.
+ * @param {object} respType - Response type.
+ * @param {function} cb - The callback function.
+ *
+ * @private
+ *
+ * @example
+ * var deleteRequest = {
+ *   MODE: 'NON_TRANSACTIONAL',
+ *   mutation: {
+ *     delete: [] // datastore key objects.
+ *   }
+ * };
+ * transaction.makeReq('commit', deleteRequest, function(err) {});
+ */
+DatastoreRequest.prototype.createRequest_ =
+    function(method, req, respType, cb) {
+  // TODO: Handle non-HTTP 200 cases.
+  cb = cb || util.noop;
+  this.connection.createAuthorizedReq({
+    method: 'POST',
+    host: GOOGLE_APIS_HOST,
+    path: '/datastore/v1beta2/datasets/' + this.projectId + '/' + method,
+    headers: {
+      'content-type': 'application/x-protobuf'
+    }
+  }, function(err, request) {
+    if (err) {
+      cb(err);
+      return;
+    }
+    var remoteStream = https.request(request, function(resp) {
+      var buffer = new Buffer('');
+      resp.on('data', function(chunk) {
+        buffer = Buffer.concat([buffer, chunk]);
+      });
+      resp.on('end', function() {
+        util.handleResp(null, resp, buffer.toString(), function(err) {
+          if (err) {
+            cb(err);
+            return;
+          }
+          cb(null, respType.decode(buffer));
+        });
+      });
+    });
+    remoteStream.on('error', cb);
+    remoteStream.write(req.toBuffer());
+    remoteStream.end();
+  });
+};
+
+module.exports = DatastoreRequest;
diff --git a/lib/datastore/transaction.js b/lib/datastore/transaction.js
index ed495df23a61..0d68ea8048eb 100644
--- a/lib/datastore/transaction.js
+++ b/lib/datastore/transaction.js
@@ -1,4 +1,4 @@
-/**
+/*!
  * Copyright 2014 Google Inc. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,62 +14,67 @@
  * limitations under the License.
  */
 
-/**
- * @private
+/*!
  * @module datastore/transaction
  */
 
 'use strict';
 
-var https = require('https');
-
-/** @type module:datastore/entity */
-var entity = require('./entity.js');
+var nodeutil = require('util');
 
-/** @type module:datastore/pb */
+/**
+ * @type module:datastore/pb
+ * @private
+ */
 var pb = require('./pb.js');
 
-/** @type module:common/util */
+/**
+ * @type module:common/util
+ * @private
+ */
 var util = require('../common/util.js');
 
-/** @const {string} Host to send with API requests. */
-var GOOGLE_APIS_HOST = 'www.googleapis.com';
-
-/** @const {string} Non-transaction mode key. */
-var MODE_NON_TRANSACTIONAL = 'NON_TRANSACTIONAL';
+/**
+ * @type module:datastore/request
+ * @private
+ */
+var DatastoreRequest = require('./request.js');
 
-/** @const {string} Transaction mode key. */
-var MODE_TRANSACTIONAL = 'TRANSACTIONAL';
 
+/*! Developer Documentation
+ *
+ * @param {module:common/connection#Connection} connection - An authorized
+ *     connection to Google Cloud Datastore.
+ * @param {string} projectId - Dataset ID. This is your project ID from the
+ *     Google Developers Console.
+ */
 /**
- * Build a Transaction object. Transactions will generally be built for you by
+ * Build a Transaction object. Transactions will be created for you by
  * {@linkcode module:datastore/dataset}. When you need to run a transactional
- * operation, you use {@linkcode module:datastore/dataset#runInTransaction}.
+ * operation, use {@linkcode module:datastore/dataset#runInTransaction}.
  *
  * *Reference: {@link http://goo.gl/n4oSjt}*
  *
  * @constructor
  * @alias module:datastore/transaction
- *
- * @param {module:common/connection.Connection} conn - An authorized connection
- *     to Google Cloud Datastore.
- * @param {string} datasetId - Dataset ID. This is your project ID from the
- *     Google Developers Console.
+ * @mixes module:datastore/request
  *
  * @example
- * var Connection = require('lib/common/connection.js').Connection;
- * var myConnection = new Connection({});
- * var transaction = new Transaction(myConnection, 'my-project-id');
+ * dataset.runInTransaction(function(transaction, done) {
+ *   // `transaction` is a Transaction object.
+ * });
  */
-function Transaction(conn, datasetId) {
-  this.conn = conn;
-  this.datasetId = datasetId;
+function Transaction(connection, projectId) {
+  this.connection = connection;
+  this.projectId = projectId;
   // the default transaction has no id.
   // if id is not set, run operations non-transactional.
   this.id = null;
   this.isFinalized = false;
 }
 
+nodeutil.inherits(Transaction, DatastoreRequest);
+
 /**
  * Begin a remote transaction and identify the current transaction instance with
  * the remote transaction's ID.
@@ -94,7 +99,7 @@ Transaction.prototype.begin = function(callback) {
   var that = this;
   var req = new pb.BeginTransactionRequest();
   var res = pb.BeginTransactionResponse;
-  this.makeReq('beginTransaction', req, res, function(err, resp) {
+  this.createRequest_('beginTransaction', req, res, function(err, resp) {
     if (err) {
       callback(err);
       return;
@@ -123,7 +128,7 @@ Transaction.prototype.rollback = function(callback) {
   var that = this;
   var req = new pb.RollbackRequest({ transaction: this.id });
   var res = pb.RollbackResponse;
-  this.makeReq('rollback', req, res, function(err) {
+  this.createRequest_('rollback', req, res, function(err) {
     that.isFinalized = true;
     callback(err || null);
   });
@@ -148,7 +153,7 @@ Transaction.prototype.commit = function(callback) {
   var that = this;
   var req = new pb.CommitRequest({ transaction: this.id });
   var res = pb.CommitResponse;
-  this.makeReq('commit', req, res, function(err) {
+  this.createRequest_('commit', req, res, function(err) {
     if (err) {
       callback(err);
       return;
@@ -180,332 +185,15 @@ Transaction.prototype.finalize = function(callback) {
   setImmediate(callback);
 };
 
-/**
- * Retrieve the entities identified with the specified key(s) in the current
- * transaction. Get operations require a valid key to retrieve the
- * key-identified entity from Datastore.
- *
- * @param {Key|Key[]} key - Datastore key object(s).
- * @param {function} callback - The callback function.
- *
- * @example
- * // These examples work with both a Transaction object and a Dataset object.
- *
- * // Get a single entity.
- * transaction.get(dataset.key(['Company', 123]), function(err, entity) {});
- *
- * // Get multiple entities at once.
- * transaction.get([
- *   dataset.key(['Company', 123]),
- *   dataset.key(['Product', 'Computer'])
- * ], function(err, entities) {});
- */
-Transaction.prototype.get = function(keys, callback) {
-  var isMultipleRequest = Array.isArray(keys);
-  keys = isMultipleRequest ? keys : [keys];
-  callback = callback || util.noop;
-  var req = new pb.LookupRequest({
-    key: keys.map(entity.keyToKeyProto)
-  });
-  var res = pb.LookupResponse;
-  if (this.id) {
-    req.transaction = this.id;
-  }
-  this.makeReq('lookup', req, res, function(err, resp) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    var found = entity.formatArray(resp.found);
-    if (isMultipleRequest && resp.deferred && resp.deferred.length) {
-      // There may be more results. Call `.get` again, and append the results.
-      this.get(
-          resp.deferred.map(entity.keyFromKeyProto), function (err, entities) {
-        if (err) {
-          callback(err);
-          return;
-        }
-        if (resp) {
-          found = (found || []).concat(entities);
-        }
-        callback(null, found);
-      });
-      return;
-    }
-    callback(null, isMultipleRequest ? found : found[0]);
-  }.bind(this));
-};
-
-/**
- * Insert or update the specified object(s) in the current transaction. If a key
- * is incomplete, its associated object is inserted and its generated identifier
- * is returned to the callback.
- *
- * This method automatically handles the `upsert`, `insert`, `update`, and
- * `insertAutoId` Datastore methods.
- *
- * By default, all properties are indexed. To prevent a property from being
- * included in *all* indexes, you must supply an entity's `data` property as an
- * array. See below for an example.
- *
- * @param {object|object[]} entities - Datastore key object(s).
- * @param {Key} entities.key - Datastore key object.
- * @param {object|object[]} entities.data - Data to save with the provided key.
- *     If you provide an array of objects, you must use the explicit syntax:
- *     `name` for the name of the property and `value` for its value. You may
- *     also specify an `excludeFromIndexes` property, set to `true` or `false`.
- * @param {function} callback - The callback function.
- *
- * @example
- * // These examples work with both a Transaction object and a Dataset object.
- *
- * // Save a single entity.
- * transaction.save({
- *   key: dataset.key('Company'),
- *   data: {
- *     rating: '10'
- *   }
- * }, function(err, key) {
- *   // Because we gave an incomplete key as an argument, `key` will be
- *   // populated with the complete, generated key.
- * });
- *
- * // To specify an `excludeFromIndexes` value for a Datastore entity, pass in
- * // an array for the key's data. The above example would then look like:
- * transaction.save({
- *   key: dataset.key('Company'),
- *   data: [
- *     {
- *       name: 'rating',
- *       value: '10',
- *       excludeFromIndexes: false
- *     }
- *   ]
- * }, function(err, key) {});
- *
- * // Save multiple entities at once.
- * transaction.save([
- *   {
- *     key: dataset.key(['Company', 123]),
- *     data: {
- *       HQ: 'Dallas, TX'
- *     }
- *   },
- *   {
- *     key: dataset.key(['Product', 'Computer']),
- *     data: {
- *       vendor: 'Dell'
- *     }
- *   }
- * ], function(err, keys) {});
- */
-Transaction.prototype.save = function(entities, callback) {
-  var isMultipleRequest = Array.isArray(entities);
-  entities = isMultipleRequest ? entities : [entities];
-  var insertIndexes = [];
-  var keys = entities.map(function(entityObject) {
-    return entityObject.key;
-  });
-  var req = {
-    mode: MODE_NON_TRANSACTIONAL,
-    mutation: entities.reduce(function(acc, entityObject, index) {
-      var ent = {};
-      if (Array.isArray(entityObject.data)) {
-        ent.property = entityObject.data.map(function(data) {
-          data.value = entity.valueToProperty(data.value);
-          if (util.is(data.excludeFromIndexes, 'boolean')) {
-            data.value.indexed = !data.excludeFromIndexes;
-            delete data.excludeFromIndexes;
-          }
-          return data;
-        });
-      } else {
-        ent = entity.entityToEntityProto(entityObject.data);
-      }
-      ent.key = entity.keyToKeyProto(entityObject.key);
-      if (entity.isKeyComplete(entityObject.key)) {
-        acc.upsert.push(ent);
-      } else {
-        insertIndexes.push(index);
-        acc.insert_auto_id.push(ent);
-      }
-      return acc;
-    }.bind(this), { upsert: [], insert_auto_id: [] })
-  };
-  if (this.id) {
-    req.transaction = this.id;
-    req.mode = MODE_TRANSACTIONAL;
-  }
-  req = new pb.CommitRequest(req);
-  var res = pb.CommitResponse;
-  this.makeReq('commit', req, res, function(err, resp) {
-    if (err || !resp) {
-      callback(err);
-      return;
-    }
-    if (this.id) {
-      this.isFinalized = true;
-    }
-    var autoInserted = (resp.mutation_result.insert_auto_id_key || []);
-    autoInserted.forEach(function(key, index) {
-      keys[insertIndexes[index]] = entity.keyFromKeyProto(key);
-    });
-    callback(null, isMultipleRequest ? keys : keys[0]);
-  }.bind(this));
-};
-
-/**
- * Delete all entities identified with the specified key(s) in the current
- * transaction.
- *
- * @param {Key|Key[]} key - Datastore key object(s).
- * @param {function} callback - The callback function.
- *
- * @example
- * // These examples work with both a Transaction object and a Dataset object.
- *
- * // Delete a single entity.
- * transaction.delete(dataset.key(['Company', 123]), function(err) {});
- *
- * // Delete multiple entities at once.
- * transaction.delete([
- *   dataset.key(['Company', 123]),
- *   dataset.key(['Product', 'Computer'])
- * ], function(err) {});
- */
-Transaction.prototype.delete = function(keys, callback) {
-  var isMultipleRequest = Array.isArray(keys);
-  keys = isMultipleRequest ? keys : [keys];
-  callback = callback || util.noop;
-
-  var req = {
-    mode: MODE_NON_TRANSACTIONAL,
-    mutation: {
-      delete: keys.map(entity.keyToKeyProto)
-    }
-  };
-  if (this.id) {
-    req.transaction = this.id;
-    req.mode = MODE_TRANSACTIONAL;
-  }
-  req = new pb.CommitRequest(req);
-  var res = pb.CommitResponse;
-  this.makeReq('commit', req, res, function(err, response) {
-    if (this.id) {
-      this.isFinalized = true;
-    }
-    callback(err, response);
-  }.bind(this));
-};
-
-/**
- * Datastore allows you to query entities by kind, filter them by property
- * filters, and sort them by a property name. Projection and pagination are also
- * supported. If more results are available, a query to retrieve the next page
- * is provided to the callback function.
- *
- * @param {module:datastore/query} query - Query object.
- * @param {function} callback - The callback function.
- *
- * @example
- * // Retrieve 5 companies.
- * transaction.runQuery(queryObject, function(err, entities, nextQuery) {
- *   // `nextQuery` is not null if there are more results.
- *   if (nextQuery) {
- *     transaction.runQuery(nextQuery, function(err, entities, nextQuery) {});
- *   }
- * });
- */
-Transaction.prototype.runQuery = function(q, callback) {
-  callback = callback || util.noop;
-  var req = {
-    read_options: {
-      transaction: this.id
-    },
-    query: entity.queryToQueryProto(q)
-  };
-  if (q.namespace) {
-    req.partition_id = {
-      namespace: q.namespace
-    };
-  }
-  req = new pb.RunQueryRequest(req);
-  var res = pb.RunQueryResponse;
-  this.makeReq('runQuery', req, res, function(err, resp) {
-    if (err || !resp.batch || !resp.batch.entity_result) {
-      callback(err);
-      return;
-    }
-    var nextQuery = null;
-    if (resp.batch.end_cursor) {
-      var cursor = resp.batch.end_cursor.toBase64();
-      if (cursor !== q.startVal) {
-        nextQuery = q.start(cursor).offset(0);
-      }
-    }
-    callback(null, entity.formatArray(resp.batch.entity_result), nextQuery);
-  });
-};
-
 /**
  * mapQuery
  *
  * @todo Implement.
+ *
+ * @private
  */
 Transaction.prototype.mapQuery = function() {
   throw new Error('not yet implemented');
 };
 
-/**
- * Make a request to the API endpoint.
- *
- * @param {string} method - Transaction action (allocateIds, commit, etc.).
- * @param {object} req - Request configuration object.
- * @param {function} callbcak - The callback function.
- *
- * @example
- * var deleteRequest = {
- *   MODE: 'NON_TRANSACTIONAL',
- *   mutation: {
- *     delete: [] // datastore key objects.
- *   }
- * };
- * transaction.makeReq('commit', deleteRequest, function(err) {});
- */
-Transaction.prototype.makeReq = function(method, req, respType, callback) {
-  // TODO: Handle non-HTTP 200 cases.
-  callback = callback || util.noop;
-  this.conn.createAuthorizedReq({
-    method: 'POST',
-    host: GOOGLE_APIS_HOST,
-    path: '/datastore/v1beta2/datasets/' + this.datasetId + '/' + method,
-    headers: {
-      'content-type': 'application/x-protobuf'
-    }
-  }, function(err, request) {
-    if (err) {
-      callback(err);
-      return;
-    }
-    var remoteStream = https.request(request, function(resp) {
-      var buffer = new Buffer('');
-      resp.on('data', function(chunk) {
-        buffer = Buffer.concat([buffer, chunk]);
-      });
-      resp.on('end', function() {
-        util.handleResp(null, resp, buffer.toString(), function(err) {
-          if (err) {
-            callback(err);
-            return;
-          }
-          callback(null, respType.decode(buffer));
-        });
-      });
-    });
-    remoteStream.on('error', callback);
-    remoteStream.write(req.toBuffer());
-    remoteStream.end();
-  });
-};
-
 module.exports = Transaction;
diff --git a/package.json b/package.json
index 13b7540b15fe..9534ae9d7582 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "tmp": "0.0.24"
   },
   "scripts": {
-    "docs": "dox < lib/index.js > docs/json/master/index.json & dox < lib/datastore/dataset.js > docs/json/master/datastore/dataset.json & dox < lib/datastore/index.js > docs/json/master/datastore/index.json & dox < lib/datastore/query.js > docs/json/master/datastore/query.json & dox < lib/storage/index.js > docs/json/master/storage/index.json",
+    "docs": "dox < lib/index.js > docs/json/master/index.json & dox < lib/datastore/dataset.js > docs/json/master/datastore/dataset.json & dox < lib/datastore/transaction.js > docs/json/master/datastore/transaction.json & dox < lib/datastore/index.js > docs/json/master/datastore/index.json & dox < lib/datastore/request.js > docs/json/master/datastore/request.json & dox < lib/datastore/query.js > docs/json/master/datastore/query.json & dox < lib/storage/index.js > docs/json/master/storage/index.json",
     "lint": "jshint lib/ regression/ test/",
     "test": "mocha --recursive --reporter spec",
     "regression-test": "mocha regression/datastore.js regression/storage.js --reporter spec --timeout 15000",
diff --git a/test/datastore/dataset.js b/test/datastore/dataset.js
index 7b8695f45af2..90bad497befa 100644
--- a/test/datastore/dataset.js
+++ b/test/datastore/dataset.js
@@ -94,7 +94,7 @@ describe('Dataset', function() {
 
   it('should get by key', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'lookup');
       assert.equal(proto.key.length, 1);
       callback(null, mockRespGet);
@@ -111,7 +111,7 @@ describe('Dataset', function() {
 
   it('should multi get by keys', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'lookup');
       assert.equal(proto.key.length, 1);
       callback(null, mockRespGet);
@@ -133,7 +133,7 @@ describe('Dataset', function() {
     var key = ds.key(['Kind', 5732568548769792]);
     var key2 = ds.key(['Kind', 5732568548769792]);
     var lookupCount = 0;
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       lookupCount++;
       assert.equal(method, 'lookup');
       if (mockRespGet.deferred.length) {
@@ -153,7 +153,7 @@ describe('Dataset', function() {
 
   it('should delete by key', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'commit');
       assert.equal(!!proto.mutation.delete, true);
       callback();
@@ -163,7 +163,7 @@ describe('Dataset', function() {
 
   it('should multi delete by keys', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'commit');
       assert.equal(proto.mutation.delete.length, 2);
       callback();
@@ -176,7 +176,7 @@ describe('Dataset', function() {
 
   it('should save with incomplete key', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'commit');
       assert.equal(proto.mutation.insert_auto_id.length, 1);
       callback();
@@ -187,7 +187,7 @@ describe('Dataset', function() {
 
   it('should save with keys', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'commit');
       assert.equal(proto.mutation.upsert.length, 2);
       assert.equal(proto.mutation.upsert[0].property[0].name, 'k');
@@ -203,7 +203,7 @@ describe('Dataset', function() {
 
   it('should produce proper allocate IDs req protos', function(done) {
     var ds = datastore.dataset({ projectId: 'test' });
-    ds.transaction.makeReq = function(method, proto, typ, callback) {
+    ds.createRequest_ = function(method, proto, typ, callback) {
       assert.equal(method, 'allocateIds');
       assert.equal(proto.key.length, 1);
       assert.deepEqual(proto.key[0], {
@@ -237,7 +237,7 @@ describe('Dataset', function() {
       ds = datastore.dataset({ projectId: 'test' });
       ds.createTransaction_ = function() {
         transaction = new Transaction();
-        transaction.makeReq = function(method, proto, typ, callback) {
+        transaction.createRequest_ = function(method, proto, typ, callback) {
           assert.equal(method, 'beginTransaction');
           callback(null, { transaction: '' });
         };
@@ -257,7 +257,7 @@ describe('Dataset', function() {
 
     it('should commit the transaction when done', function() {
       ds.runInTransaction(function(t, done) {
-        transaction.makeReq = function(method) {
+        transaction.createRequest_ = function(method) {
           assert.equal(method, 'commit');
         };
         done();
@@ -325,7 +325,7 @@ describe('Dataset', function() {
     describe('errors', function() {
       it('should handle upstream errors', function() {
         var upstreamError = new Error('upstream error.');
-        ds.transaction.makeReq = function(method, proto, typ, callback) {
+        ds.createRequest_ = function(method, proto, typ, callback) {
           assert.equal(method, 'runQuery');
           callback(upstreamError);
         };
@@ -336,7 +336,7 @@ describe('Dataset', function() {
       });
 
       it('should handle missing results error', function() {
-        ds.transaction.makeReq = function(method, proto, typ, callback) {
+        ds.createRequest_ = function(method, proto, typ, callback) {
           assert.equal(method, 'runQuery');
           callback('simulated-error', mockResponse.withoutResults);
         };
@@ -348,7 +348,7 @@ describe('Dataset', function() {
     });
 
     it('should execute callback with results', function() {
-      ds.transaction.makeReq = function(method, proto, typ, callback) {
+      ds.createRequest_ = function(method, proto, typ, callback) {
         assert.equal(method, 'runQuery');
         callback(null, mockResponse.withResults);
       };
@@ -365,7 +365,7 @@ describe('Dataset', function() {
     });
 
     it('should return a new query if results remain', function() {
-      ds.transaction.makeReq = function(method, proto, typ, callback) {
+      ds.createRequest_ = function(method, proto, typ, callback) {
         assert.equal(method, 'runQuery');
         callback(null, mockResponse.withResultsAndEndCursor);
       };
diff --git a/test/datastore/transaction.js b/test/datastore/transaction.js
index 807acca4ed13..fd1e241b95e3 100644
--- a/test/datastore/transaction.js
+++ b/test/datastore/transaction.js
@@ -33,7 +33,7 @@ describe('Transaction', function() {
 
   describe('begin', function() {
     it('should begin', function(done) {
-      transaction.makeReq = function(method, proto, respType, callback) {
+      transaction.createRequest_ = function(method, proto, respType, callback) {
         assert.equal(method, 'beginTransaction');
         callback(null, 'some-id');
       };
@@ -47,7 +47,7 @@ describe('Transaction', function() {
     });
 
     it('should rollback', function(done) {
-      transaction.makeReq = function(method, proto, respType, callback) {
+      transaction.createRequest_ = function(method, proto, respType, callback) {
         assert.equal(method, 'rollback');
         assert.equal(
           proto.transaction.toBase64(),
@@ -62,7 +62,7 @@ describe('Transaction', function() {
 
     it('should mark as `finalized` when rollback errors', function(done) {
       var error = new Error('rollback error');
-      transaction.makeReq = function(method, proto, respType, callback) {
+      transaction.createRequest_ = function(method, proto, respType, callback) {
        callback(error);
       };
       transaction.rollback(function(err) {
@@ -76,7 +76,7 @@ describe('Transaction', function() {
   describe('commit', function() {
     it('should commit', function(done) {
       transaction.id = 'some-id';
-      transaction.makeReq = function(method, proto, respType, callback) {
+      transaction.createRequest_ = function(method, proto, respType, callback) {
         assert.equal(method, 'commit');
         assert.equal(
           proto.transaction.toBase64(),
@@ -92,7 +92,7 @@ describe('Transaction', function() {
 
   describe('finalize', function() {
     it('should be committed if not rolled back', function(done) {
-      transaction.makeReq = function(method) {
+      transaction.createRequest_ = function(method) {
         assert.equal(method, 'commit');
         done();
       };
@@ -107,7 +107,7 @@ describe('Transaction', function() {
     });
 
     it('should not set an indexed value by default', function() {
-      transaction.makeReq = function(method, req) {
+      transaction.createRequest_ = function(method, req) {
         var property = req.mutation.upsert[0].property[0];
         assert.strictEqual(property.value.indexed, null);
       };
@@ -118,7 +118,7 @@ describe('Transaction', function() {
     });
 
     it('should allow setting the indexed value of a property', function() {
-      transaction.makeReq = function(method, req) {
+      transaction.createRequest_ = function(method, req) {
         var property = req.mutation.upsert[0].property[0];
         assert.equal(property.name, 'name');
         assert.equal(property.value.string_value, 'value');