diff --git a/.gitignore b/.gitignore
index 0e6c4d9..0937b67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
-dist/*
-.tmp
-test/keen-unit-all.js
-node_modules
-bower_components
 *.log
 .DS_Store
+.tmp
+.awspublish-*
+dist/*
+bower_components
+node_modules
+test/keen-unit-all.js
+test/unit/build/*
diff --git a/.npmignore b/.npmignore
new file mode 100644
index 0000000..3f6b437
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1,16 @@
+.bowerrc
+.DS_Store
+.git*
+*.log
+*.md
+*.yml
+.tmp*
+.awspublish-*
+
+bower.json
+gulpfile.js
+karma.conf.js
+
+docs
+dist
+test
diff --git a/.travis.yml b/.travis.yml
index 13da1b4..f60c5c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,9 @@
 language: node_js
-
 node_js:
   - "0.10"
-
 branches:
   only:
     - master
-
 env:
   global:
   - secure: |-
@@ -17,19 +14,10 @@ env:
       AjvRPOjPEuDl8qwEUOk2V1HH6C5AoE8V0/1+twsnaEcgfHWGDk3g7oPfMOW3
       ArybZFvN+wpvWfwoJAhRV7yQv9yoGT1fEtMtn3GB9mQiCFO70L/MrqXePJAr
       ajs3LH0wqhj1zW8UUmhTxBSLvzRyW++W5yx2hYr92EkrlpFZZUg=
-  - LOGS_DIR=/tmp/keen-build/logs
-
 install:
-  - npm install -g grunt-cli
+  - npm install -g browserify
   - npm install -g bower
   - npm install
   - bower install
-
-before_script:
-  - mkdir -p $LOGS_DIR
-  - chmod +x ./config/sauce_connect_setup.sh
-  - ./config/sauce_connect_setup.sh
-
 notifications:
-  email:
-    on_success: never
+  email: never
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..857e73c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,204 @@
+<!--
+<a name="unreleased"></a>
+# Unreleased
+-->
+
+<a name="3.2.0"></a>
+# 3.2.0 keen-js learns to node.js (2014-12-28)
+
+This library now runs in the browser and the server, and can be installed via npm: `npm install keen-js`
+
+## New to keen-js
+
+* 'client.addEvents' - record multiple events with a single API call (#108)
+* 'client.addEvent("collection", data, null, false)' - fourth argument of `null` invokes a synchronous XHR call, which is useful for sending events before a page unloads (#188)
+* 'client.get' - execute a generic GET request (New approach to #139)
+* 'client.put' - execute a generic PUT request
+* 'client.post' - execute a generic POST request
+* 'client.del' - execute a generic DELETE request (server-only)
+* `Keen.utils.encryptScopedKeys` - create a new scoped key
+* `Keen.utils.decryptScopedKeys` - decrypt an existing scoped key
+* `Keen.noConflict` – avoid version collisions (#159)
+* `Keen.Request` object supports timeouts (explained below), and must be explicitly run with `.refresh()` (#209, wip)
+* "Metric" visualization shows raw value via the HTML element's `title` attribute (#206, wip)
+
+```javascript
+var req = new Keen.Request(client, [query1, query2], callback)
+  .timeout(300*1000)
+  .refresh();
+```
+
+## Keen.Visualization has been removed
+
+This object doesn't add any value, and only creates more surface-area for new users to reason about.
+
+Check out `Keen.Dataviz` for building customized visualizations. The docs have been updated to reflect this object's departure, and <Client>.run still works as expected.
+
+## Breaking change to all callback signatures
+
+All callbacks now use the single function `(err, res)` callback pattern common to node.js. This was done to make implementations portable between the browser and the server.
+
+This:
+
+```javascript
+client.run(query, function(res){
+  // handle response
+}, function(err){
+  // handle error
+});
+```
+
+Now looks like this:
+
+```javascript
+client.run(query, function(err, res){
+  // if (err) handle err
+  // handle response
+});
+```
+
+## Build/test-related
+
+* Switched from [grunt](http://gruntjs.com/) to [gulp](http://gulpjs.com/)
+* [Browserify](http://browserify.org/) builds browser-specific versions of the library
+* [Karma](http://karma-runner.github.io/) runs tests on local browsers (Chrome, FF, Safari)
+* [SauceLabs testing](https://saucelabs.com/u/keenlabs) tests IE + mobile
+
+
+<a name="3.1.0"></a>
+# 3.1.0 Visualization Reboot (2014-11-03)
+
+Complete rewrite of `Keen.Visualization`, resulting in two brand new tools for creating dynamic, highly-customizable data visualizations.
+
+## [Dataviz](https://github.com/keenlabs/keen-js/tree/master/src/dataviz)
+
+* Composable interface for on-the-fly modifications of [pretty much everything](https://github.com/keenlabs/keen-js/tree/master/src/dataviz)
+* Improved memory management, smaller footprint, better performance
+* Charts render a million times faster (not benchmarked, but srsly, it's silly)
+* Two new chart library adapters: [Chart.js](http://www.chartjs.org/) and [C3.js](http://c3js.org/). Either can be configured as the default
+* Expanded color palette with 18 light+dark variants: now at 27 colors!
+* Explicit methods for [handling different types of data](https://github.com/keenlabs/keen-js/tree/clean-viz/src/dataviz#data-handling)
+* Explicit methods for updating charts, with full control of "loading" state spinner
+* Display custom error messages
+* Determine if intervals should be indexed by "timeframe.start" or "timeframe.end"
+* Sort both groups and intervals, ascending or descending
+
+## [Dataset](https://github.com/keenlabs/keen-js/tree/master/src/dataset)
+
+Dataset is an abstraction layer that handles data inside of `Keen.Dataviz`. This tool unpacks arbitrary JSON into a 2-dimensional array (a table), and offers a set of simple but powerful tools for modifying, filtering and sorting that data. `Keen.Dataviz` charting adapters all know how to unpack this data format into their own crazy needs.
+
+I'll build out a series of demos that showcase what this tool can do, but here are a few examples that you can accomplish with a few (like one or two) lines of javascript:
+
+* For a group_by + interval query:
+* Insert a new series that shows the median (sum/min/max/etc) value of all data points at each interval
+* Sort groups bases the those same results (sort by sum of each series)
+* Remove all records/series that fall below a given threshold (only show the top N results)
+* Multiply all results by 100, or any number
+* Join multiple queries into one chart
+
+The big idea here is that it takes something that once took dozens or hundreds of lines of loopy JS magic and turns it into a quick, repeatable, easily-customizable use of a documented feature.
+
+## Test Coverage
+
+We added over **150 new tests** to cover these two classes, and have expanded our test coverage to include iOS (6-7.1), Android (4.1-4.4), and Chrome/Firefox Beta builds.
+
+## Optimizations
+
+Disable sending of events by setting `Keen.enabled = false;`. This is handy for disabling event recording from local or development environments.
+
+Refactored our [loading script](https://gist.github.com/dustinlarimer/19fedf00c44d120ef8b4), makes it easy to stay up to date with the latest version. Now, when users see the JS blob for embedding our library in the page, it'll look like this:
+
+```javascript
+!function(i,o){i("Keen","//d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js",o)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
+```
+
+## Client configuration
+
+**Internals have changed:** Client instances have an internal hash that contains properties, like `projectId` and `readKey`. This internal hash was previously called `client`, but has been renamed `config`. Reason being, "client" has become a popular name for new instances, resulting in strange references like `client.client.projectId`.
+
+You can now also reference projectId and keys w/ a set of getter-setter methods, like so:
+
+```javascript
+var client = new Keen({
+  projectId: "123",
+  readKey: "123456789"
+});
+client.projectId(); // returns "123"
+client.readKey(); // returns "123456789"
+```
+
+<a name="3.0.9"></a>
+# 3.0.9 Improved request handling (2014-10-01)
+
+This update greatly improves request handling for sending and querying events.
+
+If JSONP is selected and the produced URL exceeds a given threshold, the library attempts to use XHR/POST if supported.
+
+We have also added more robust support for XHR in older versions of IE, and expanded test coverage to include iOS (6-7.1), Android (4.1-4.4), and Chrome/Firefox Beta builds.
+
+<a name="3.0.8"></a>
+# 3.0.8 Improved memory management for Keen.Visualization (2014-08-18)
+
+Call .remove() or .trigger("remove") on a chart for proper disposal.
+
+<a name="3.0.7"></a>
+# 3.0.7 Bug fixes, timezone fixes, query refreshing (2014-08-06)
+
+__No notes, sorry__
+
+<a name="3.0.6"></a>
+# 3.0.6 [YANKED]
+
+<a name="3.0.5"></a>
+# 3.0.5 AMD Support
+
+This release refactors internal dependency placement to allow for easy use with RequireJS. The library is loaded with an explicitly named module ID ("keen"), which presents a light configuration step, but prevents anonymous define() mismatch mayhem.
+
+Example implementation:
+
+```javascript
+requirejs.config({
+  paths: {
+    "keen": "http://d26b395fwzu5fz.cloudfront.net/3.0.5/keen.js"
+  }
+});
+require([ "keen" ], function(Keen) {
+  var client = new Keen({ ... });
+});
+```
+
+<a name="3.0.4"></a>
+# 3.0.4 Important patch for IE11
+
+Fixed a type-check method that caused queries to fail in IE11 (#96).
+
+<a name="3.0.3"></a>
+# 3.0.3 Visual Error Messages
+
+client.draw() now visualizes API response messages when errors occur.
+
+<a name="3.0.2"></a>
+# 3.0.2 Fixed trackExternalLink and data sorting
+
+Fixed an issue with trackExternalLink ignoring `target="_blank"` attributes, and failing to execute when anchor tags have nested DOM elements like `<span>` tags.
+
+Applied column sorting to static group-by queries, for better arrangment in pie and bar charts.
+
+Fixed #73, #90 and #92
+
+<a name="3.0.1"></a>
+# 3.0.1 Visualization bug fixes and enhancements
+
+* Keen.Metric now supports chartOptions.prefix, chartOptions.suffix, and has more stable colors handling.
+* Grouped interval responses are presented with a multi-line chart now.
+* Changed chartType: "datatable" to table. datatable was left behind from an internal project, but breaks the naming pattern we want to establish with underlying libraries.
+* Expanded color palette
+
+![Color wheel](https://s3.amazonaws.com/uploads.hipchat.com/14465/113676/MjoVfScQYOcEbie/upload.png)
+
+Resolves #72, #74, #76, #80, #82, #85, #86, #87
+
+<a name="3.0.0"></a>
+# 3.0.0 Hello, world
+
+Initial re-release of keen-js!
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1ee1123..296a387 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,12 +8,15 @@ $ npm install
 $ bower install
 
 # Build and launch project site
-$ grunt dev
+$ gulp
+
+# Build and launch with tests
+$ gulp with-tests
 
 # View test results at http://localhost:9999
 ```
 
-## Pull Request Template 
+## Pull Request Template
 
 Please use the PR template below.
 
@@ -26,7 +29,7 @@ Please use the PR template below.
 
 #### How should this be manually tested? (if appropriate)
 
-* run `grunt dev`
+* run `gulp with-tests`
 * tests run at `localhost:9999/`
 
 #### Are there any related issues open?
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 3492071..0000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,240 +0,0 @@
-var saucelabs = require('./config/saucelabs')(),
-    aws = require('./config/aws')(),
-    wraps = require('./config/wrappers')();
-
-module.exports = function(grunt) {
-
-  grunt.loadNpmTasks("grunt-contrib-connect");
-  grunt.loadNpmTasks("grunt-contrib-concat");
-  grunt.loadNpmTasks("grunt-contrib-watch");
-  grunt.loadNpmTasks('grunt-s3');
-  grunt.loadNpmTasks('grunt-yui-compressor');
-
-  grunt.loadNpmTasks('grunt-saucelabs');
-
-  grunt.initConfig({
-    pkg: grunt.file.readJSON("package.json"),
-
-    concat: {
-
-      options: {
-        stripBanners: {
-          block: true,
-          line: true
-        },
-        process: function(src, filepath) {
-          var namespace = (grunt.option("namespace") || false);
-          src = ((namespace) ? src.replace("'Keen'", "'" + namespace + "'") : src);
-          src = src.replace("BUILD_VERSION", grunt.file.readJSON("package.json")["version"]);
-          return "// Source: " + filepath + "\n" + src;
-        }
-      },
-
-      // Assemble Keen (core)
-      core: {
-        src: [
-            "src/core/index.js"
-          , "src/core/events.js"
-          , "src/core/async.js"
-          , "src/core/**/*.js"
-        ],
-        dest: ".tmp/core.js"
-      },
-
-      // Assemble Keen.Dataset
-      dataset: {
-        src: [
-          "src/dataset/index.js",
-          "src/dataset/**/*.js"
-        ],
-        dest: ".tmp/dataset.js"
-      },
-
-      // Assemble Keen.Dataviz
-      dataviz: {
-        src: [
-          "src/dataviz/index.js",
-          "src/dataviz/**/*.js"
-        ],
-        dest: ".tmp/dataviz.js"
-      },
-
-      // Assemble keen.js (full)
-      all: {
-        options: {
-          // Library Banner/Footer (makes happy AMD modules)
-          banner: wraps.libraryBanner,
-          footer: wraps.libraryFooter
-        },
-        src: [
-            ".tmp/core.js"
-          , "src/query.js"
-
-          , "src/utils/base64.js"
-          , "src/utils/json2.js"
-          , "src/utils/keen-domready.js"
-          , "src/utils/keen-spinner.js"
-
-          , ".tmp/dataset.js"
-          , ".tmp/dataviz.js"
-          , "src/visualization.js"
-        ],
-        dest: "dist/<%= pkg.name %>.js"
-      },
-
-      // Assemble keen-tracking.js
-      tracker: {
-        options: {
-          banner: wraps.libraryBanner,
-          footer: wraps.libraryFooter
-        },
-        src: [
-            ".tmp/core.js"
-          , "src/utils/base64.js"
-          , "src/utils/json2.js"
-          , "src/utils/keen-domready.js"
-        ],
-        dest: "dist/<%= pkg.name %>-tracker.js"
-      },
-
-      // Build adapters as stand-alone modules
-      adapters: {
-        options: {
-          // Adapter Banner/Footer (makes happy AMD modules)
-          banner: wraps.adapterBanner,
-          footer: wraps.adapterFooter
-        },
-        files: {
-          "dist/adapters/keen-adapter-google.js"  : ["src/dataviz/adapters/google.js"],
-          "dist/adapters/keen-adapter-chartjs.js" : ["src/dataviz/adapters/chartjs.js"],
-          "dist/adapters/keen-adapter-c3.js"      : ["src/dataviz/adapters/c3.js"]
-        }
-      },
-
-      // Build unit tests
-      test: {
-        src: [
-            "test/unit/core.js"
-          , "test/unit/track.js"
-          , "test/unit/query.js"
-          , "test/unit/dataviz.js"
-          , "test/unit/dataset.js"
-          , "test/unit/visualization.js"
-          , "test/unit/utils.js"
-          , "test/unit/data/**/*.js"
-        ],
-        dest: "test/keen-unit-all.js"
-      },
-
-      loader: {
-        src: "src/loader.js",
-        dest: "dist/<%= pkg.name %>-loader.js"
-      }
-    },
-
-    min: {
-      "keen": {
-        src: "dist/<%= pkg.name %>.js",
-        dest: "dist/<%= pkg.name %>.min.js"
-      },
-      "keen-tracker": {
-        src: "dist/<%= pkg.name %>-tracker.js",
-        dest: "dist/<%= pkg.name %>-tracker.min.js"
-      },
-      "keen-loader": {
-        src: "dist/<%= pkg.name %>-loader.js",
-        dest: "dist/<%= pkg.name %>-loader.min.js"
-      }
-    },
-
-    watch: {
-      javascript: {
-        files: "src/**/*.js",
-        tasks: [ "build" ]
-      },
-      tests: {
-        files: "test/unit/**/*.js",
-        tasks: [ "build" ]
-      }
-    },
-
-    connect: {
-      server: {
-        options: {
-          base: 'test',
-          port: 9999
-        }
-      }
-    },
-
-    'saucelabs-mocha': {
-      all: {
-        options: {
-          'testname': new Date().toISOString(),
-          'username': saucelabs.username,
-          'key': saucelabs.key,
-          'build': saucelabs.buildID,
-          'urls': saucelabs.urls,
-          'browsers': saucelabs.browsers,
-          'concurrency': saucelabs.concurrency,
-          'maxRetries': saucelabs.maxRetries,
-          'max-duration': saucelabs.maxDuration,
-          'sauceConfig': saucelabs.additionalConfig
-        }
-      }
-    },
-
-    s3: {
-      options: {
-        key: aws.key,
-        secret: aws.secret,
-        bucket: aws.bucket,
-        access: 'public-read',
-        headers: {
-          // Two Year cache policy (1000 * 60 * 60 * 1) // 1 hour
-          "Cache-Control": "max-age=3600000, public",
-          "Expires": new Date(Date.now() + 3600000).toUTCString()
-        },
-        gzip: true
-      },
-      release: {
-        upload: [
-          // {
-          //   src: 'dist/*',
-          //   dest: 'latest/'
-          // },
-          {
-            src: 'dist/*',
-            dest: '<%= pkg.version %>/'
-          }
-        ]/*,
-        sync: [
-          {
-            src: 'dist/*',
-            dest: '<%= pkg.version %>/'
-          }
-        ]*/
-      },
-      staging: {
-        upload: [
-          {
-            src: 'dist/*',
-            dest: 'staging/',
-            options: {
-              headers: {
-                "Cache-Control": "max-age=1000, public",
-                "Expires": new Date(Date.now() + 1000).toUTCString()
-              }
-            }
-          }
-        ]
-      }
-    }
-
-  });
-
-  grunt.registerTask('build', ['concat', 'min']); // uglify
-  grunt.registerTask('dev', ['build', 'connect', 'watch']);
-  grunt.registerTask('test', ['build', 'connect', 'saucelabs-mocha']);
-  grunt.registerTask('default', ['build']);
-};
diff --git a/README.md b/README.md
index 71e9de6..e6d9c5b 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,17 @@
-# Keen IO JavaScript SDK (v3.1.0)
+# Keen IO JavaScript SDK (v3.2.0)
 
-**Important:** v3 is now the current version. v2 source and docs are located [here](https://github.com/keenlabs/keen-js/tree/v2).
-
-<!--
-[![Build Status](https://api.travis-ci.org/keenlabs/keen-js.png?branch=master)](https://travis-ci.org/keenlabs/keen-js)
+[![Build Status](https://api.travis-ci.org/keen/keen-js.png?branch=master)](https://travis-ci.org/keen/keen-js)
 [![Selenium Test Status](https://saucelabs.com/buildstatus/keenlabs-js)](https://saucelabs.com/u/keenlabs-js)
--->
 
-_Tracking is manually tested and validated on Internet Explorer 6, 7, and 8._
+**Important:** v3.2.0 introduced several breaking changes from previous versions. Check out the [Changelog](./Changelog.md#3.2.0) before upgrading.
+
 
 ## Documentation
 
-Docs have been moved into the master branch, so they stay in sync with each release.
+Docs have been moved into the master branch, so they stay in sync with each release. Check out the latest [here](./docs).
+
+v3.1.0 docs are [here](https://github.com/keen/keen-js/tree/v3.1.0/docs), and v2 docs are [way back here](https://github.com/keen/keen-js/tree/v2).
 
-Check out the latest [here](./docs).
 
 ## Get Project ID & API Keys
 
@@ -22,18 +20,26 @@ If you haven’t done so already, [login to Keen IO to create a project](https:/
 
 ## Install the library
 
-Load this library asynchronously from our CDN by copy/pasting this snippet of JavaScript above the `</head>` tag of your page.
+```ssh
+# via npm
+$ npm install keen-js
+
+# or bower
+$ bower install keen-js
+```
+
+For quick browser use, copy/paste this snippet of JavaScript above the `</head>` tag of your page:
 
 ```html
 <script type="text/javascript">
-  !function(a,b){a("Keen","https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js",b)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
+  !function(a,b){a("Keen","https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js",b)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
 </script>
 ```
 
-Alternatively, you can load the library synchronously from our CDN:
+Or load the library synchronously from our CDN:
 
 ```html
-<script src="https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js" type="text/javascript"></script>
+<script src="https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js" type="text/javascript"></script>
 ```
 
 Read our [Installation guide](./docs/installation.md) to learn about all the ways this library can fit into your workflow.
@@ -46,25 +52,28 @@ When instantiating a new Keen JS client, there are a number of possible configur
 ```html
 <script type="text/javascript">
   var client = new Keen({
-    projectId: "your_project_id",       // String (required)
-    writeKey: "your_project_write_key", // String (required for sending data)
-    readKey: "your_project_read_key",   // String (required for querying data)
-    protocol: "https",                  // String (optional: https | http | auto)
-    host: "api.keen.io/3.0",            // String (optional)
-    requestType: "jsonp"                // String (optional: jsonp, xhr, beacon)
+    projectId: "YOUR_PROJECT_ID",   // String (required)
+    writeKey: "YOUR_WRITE_KEY",     // String (required for sending data)
+    readKey: "YOUR_READ_KEY",       // String (required for querying data)
+    protocol: "https",              // String (optional: https | http | auto)
+    host: "api.keen.io/3.0",        // String (optional)
+    requestType: "jsonp"            // String (optional: jsonp, xhr, beacon)
   });
 </script>
 ```
 
 You can configure new instances for as many projects as necessary.
 
-## Tracking Events
+## Record a single event
 
-Let's record some data! Here is a basic example for tracking events in your app:
+Here is a basic example for tracking "purchases" in your app:
 
-``` javascript
+```javascript
 // Configure an instance for your project
-var client = new Keen({...});
+var client = new Keen({
+  projectId: "YOUR_PROJECT_ID",
+  writeKey: "YOUR_WRITE_KEY"
+});
 
 // Create a data object with the properties you want to send
 var purchase = {
@@ -82,9 +91,31 @@ client.addEvent("purchases", purchase);
 
 Send as many events as you like. Each event will be fired off to the Keen IO servers asynchronously.
 
+## Record multiple events
+
+```javascript
+// Configure an instance for your project
+var client = new Keen({...});
+
+// Send multiple events to several collections
+client.addEvents({
+  "purchases": [
+    { item: "golden gadget", price: 25.50, transaction_id: "f029342" },
+    { item: "a different gadget", price: 17.75, transaction_id: "f029342" }
+  ],
+  "transactions": [
+    {
+      id: "f029342",
+      items: 2,
+      total: 43.25
+    }
+  ]
+});
+```
+
 Read more about all the ways you can track events in our [tracking guide](./docs/track.md).
 
-Wondering what else you should track? Browse our [data modeling guide](https://github.com/keenlabs/data-modeling-guide), and send us recommendations or pull requests if you don't find what you're looking for.
+Wondering what else you should track? Browse our [data modeling guide](https://github.com/keen/data-modeling-guide), and send us recommendations or pull requests if you don't find what you're looking for.
 
 
 ## Querying events
@@ -101,8 +132,8 @@ var your_analysis = new Keen.Query(analysisType, params);
 
 ```javascript
 var client = new Keen({
-  projectId: "your_project_id",
-  readKey: "your_read_key"
+  projectId: "YOUR_PROJECT_ID",
+  readKey: "YOUR_READ_KEY"
 });
 
 var count = new Keen.Query("count", {
@@ -112,8 +143,9 @@ var count = new Keen.Query("count", {
 });
 
 // Send query
-client.run(count, function(response){
-  // response.result
+client.run(count, function(err, res){
+  // if (err) handle error
+  console.log(res.result);
 });
 ```
 
@@ -148,9 +180,15 @@ client.draw(count, document.getElementById("chart-wrapper"), {
 
 Read more about building charts from query responses in our [visualization guide](./docs/visualization.md).
 
+## Contributing
+
+This is an open source project and we love involvement from the community! Hit us up with pull requests and issues.
+
+The aim is to build up this module to completely represent the API provided by Keen IO, which is quite extensive. The more contributions the better!
+
 ## Resources
 
-[Data Modeling Guide](https://api.keen.io/3.0/projects/5337e28273f4bb4499000000/events/click?api_key=a0bb828de21e953a675610cb6e6b8935537b19c2f0ac33937d6d1df2cc8fddbf379a81ad398618897b70d15c6b42647c3e063a689bc367f5c32b66c18010541c0ad1cf3dbd36100dc4475c306b238cb6f5b05f082dc4071e35094a722b1f3e29fad63c933ea8e33e8b892c770df5e1bb&data=eyJwYWdlIjogIkRhdGEgTW9kZWxpbmcgR3VpZGUiLCJyZWZlcnJlciI6ICJSRUFETUUubWQifQ==&redirect=https://github.com/keenlabs/data-modeling-guide/)
+[Data Modeling Guide](https://api.keen.io/3.0/projects/5337e28273f4bb4499000000/events/click?api_key=a0bb828de21e953a675610cb6e6b8935537b19c2f0ac33937d6d1df2cc8fddbf379a81ad398618897b70d15c6b42647c3e063a689bc367f5c32b66c18010541c0ad1cf3dbd36100dc4475c306b238cb6f5b05f082dc4071e35094a722b1f3e29fad63c933ea8e33e8b892c770df5e1bb&data=eyJwYWdlIjogIkRhdGEgTW9kZWxpbmcgR3VpZGUiLCJyZWZlcnJlciI6ICJSRUFETUUubWQifQ==&redirect=https://github.com/keen/data-modeling-guide/)
 
 [API Technical Reference](https://api.keen.io/3.0/projects/5337e28273f4bb4499000000/events/click?api_key=a0bb828de21e953a675610cb6e6b8935537b19c2f0ac33937d6d1df2cc8fddbf379a81ad398618897b70d15c6b42647c3e063a689bc367f5c32b66c18010541c0ad1cf3dbd36100dc4475c306b238cb6f5b05f082dc4071e35094a722b1f3e29fad63c933ea8e33e8b892c770df5e1bb&data=eyJwYWdlIjogIkFQSSBUZWNobmljYWwgUmVmZXJlbmNlIiwicmVmZXJyZXIiOiAiUkVBRE1FLm1kIn0=&redirect=https://keen.io/docs/api/reference/?s=gh_js)
 
diff --git a/bower.json b/bower.json
index 6b7b86a..71cc8a3 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,8 @@
 {
   "name": "keen-js",
-  "version": "3.1.0",
-  "homepage": "https://github.com/keen/keen-js",
+  "description": "Keen IO JavaScript SDK",
+  "main": "./dist/keen.min.js",
+  "license": "MIT",
   "authors": [
     "Dustin Larimer <dustin@keen.io>",
     "Sean Dokko <sean@keen.io>",
@@ -14,7 +15,6 @@
     "Micah Wolfe <micah@keen.io>",
     "Tim Schiller <timothy.schiller@gmail.com>"
   ],
-  "description": "JS Library for the Keen IO API",
   "keywords": [
     "analytics",
     "metrics",
@@ -26,24 +26,28 @@
     "keen.io",
     "keen-io"
   ],
-  "license": "MIT",
-  "main": "./dist/keen.min.js",
+  "homepage": "https://github.com/keen/keen-js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/keen/keen-js.git"
+  },
   "ignore": [
     "**/.*",
-    "config",
     "bower_components",
     "node_modules",
+    "docs",
     "src",
     "test",
-    "Gruntfile.js",
+    "gulpfile.js",
+    "karma.conf.js",
+    ".npmignore",
     "*.json",
-    "*.md"
+    "*.md",
+    "*.yml"
   ],
   "devDependencies": {
     "mocha": "~1.18.2",
-    "chai": "~1.9.1",
-    "sinon": "http://sinonjs.org/releases/sinon-1.9.0.js",
-    "sinon-ie": "http://sinonjs.org/releases/sinon-ie-1.9.0.js",
-    "requirejs-bower": "2.1.14"
+    "requirejs-bower": "2.1.14",
+    "sinon-1.12.1": "http://sinonjs.org/releases/sinon-1.12.1.js"
   }
 }
diff --git a/config/aws.js b/config/aws.js
deleted file mode 100644
index aafdfea..0000000
--- a/config/aws.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = function(){
-
-  if (typeof process.env.AWS_KEY !== "undefined") {
-    this.key = process.env.AWS_KEY;
-  }
-
-  if (typeof process.env.AWS_SECRET !== "undefined") {
-    this.secret = process.env.AWS_SECRET;
-  }
-
-  this.bucket = 'keen-js';
-
-  return this;
-};
diff --git a/config/sauce_connect_setup.sh b/config/sauce_connect_setup.sh
deleted file mode 100644
index dbc5ba7..0000000
--- a/config/sauce_connect_setup.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Setup and start Sauce Connect for your TravisCI build
-# This script requires your .travis.yml to include the following two private env variables:
-# SAUCE_USERNAME
-# SAUCE_ACCESS_KEY
-# Follow the steps at https://saucelabs.com/opensource/travis to set that up.
-#
-# Curl and run this script as part of your .travis.yml before_script section:
-# before_script:
-#   - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh -L | bash
-
-CONNECT_URL="http://saucelabs.com/downloads/Sauce-Connect-latest.zip"
-CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
-CONNECT_DOWNLOAD="Sauce_Connect.zip"
-
-CONNECT_LOG="$LOGS_DIR/sauce-connect"
-CONNECT_STDOUT="$LOGS_DIR/sauce-connect.stdout"
-CONNECT_STDERR="$LOGS_DIR/sauce-connect.stderr"
-
-READY_FILE="connect-ready-$RANDOM"
-
-# Get Connect and start it
-mkdir -p $CONNECT_DIR
-cd $CONNECT_DIR
-curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
-unzip $CONNECT_DOWNLOAD > /dev/null
-rm $CONNECT_DOWNLOAD
-
-echo "Starting Sauce Connect in the background, logging into:"
-echo "  $CONNECT_LOG"
-echo "  $CONNECT_STDOUT"
-echo "  $CONNECT_STDERR"
-
-java -jar Sauce-Connect.jar --readyfile $READY_FILE \
-    --tunnel-identifier $TRAVIS_JOB_NUMBER \
-    $SAUCE_USERNAME $SAUCE_ACCESS_KEY &
-
-# Wait for Connect to be ready before exiting
-while [ ! -f $READY_FILE ]; do
-  sleep .5
-done
diff --git a/config/saucelabs-ie.js b/config/saucelabs-ie.js
deleted file mode 100644
index 56552a9..0000000
--- a/config/saucelabs-ie.js
+++ /dev/null
@@ -1,37 +0,0 @@
-module.exports = function(){
-
-  this.username = 'keenlabs-js';
-  this.urls = [
-    'http://127.0.0.1:9999/ie-legacy/',
-    'http://127.0.0.1:9999/ie-legacy/'
-  ];
-
-  if (typeof process.env.SAUCE_ACCESS_KEY !== "undefined") {
-    this.key = process.env.SAUCE_ACCESS_KEY;
-  }
-
-  this.browsers = [
-    {
-      browserName: "internet explorer",
-      platform: "WINDOWS 7",
-      version: "8"
-    },
-    {
-      browserName: "internet explorer",
-      platform: "WINDOWS XP",
-      version: "8"
-    },
-    {
-      browserName: "internet explorer",
-      platform: "WINDOWS XP",
-      version: "7"
-    },
-    {
-      browserName: "internet explorer",
-      platform: "WINDOWS XP",
-      version: "6"
-    }
-  ];
-
-  return this;
-};
diff --git a/config/saucelabs.js b/config/saucelabs.js
deleted file mode 100644
index ea4532a..0000000
--- a/config/saucelabs.js
+++ /dev/null
@@ -1,296 +0,0 @@
-module.exports = function(){
-
-  this.username = 'keenlabs-js';
-
-  this.key = process.env.SAUCE_ACCESS_KEY;
-  this.buildID = process.env.TRAVIS_JOB_ID;
-
-  this.urls = ['http://127.0.0.1:9999/index.html'];
-  this.concurrency = 2;
-  this.maxRetries = 3;
-  this.maxDuration = 240;
-
-  this.additionalConfig = {
-    'record-video': false,
-    'video-upload-on-pass': false,
-    'record-screenshots': false
-  };
-
-  this.browsers = [
-
-    /* FIREFOX */
-    {
-      browserName: "firefox",
-      platform: "OS X 10.9",
-      version: "beta"
-    },
-    {
-      browserName: 'firefox',
-      platform: 'Windows 8.1',
-      version: "beta"
-    },
-    {
-      browserName: 'firefox',
-      platform: 'Windows 8',
-      version: "beta"
-    },
-
-    {
-      browserName: "firefox",
-      platform: "OS X 10.9"
-    },
-    {
-      browserName: "firefox",
-      platform: "OS X 10.6"
-    },
-    {
-      browserName: "firefox",
-      platform: "Linux"
-    },
-    {
-      browserName: 'firefox',
-      platform: 'Windows 8.1'
-    },
-    {
-      browserName: 'firefox',
-      platform: 'Windows 8'
-    },
-    {
-      browserName: "firefox",
-      platform: "Windows 7"
-    },
-    {
-      browserName: "firefox",
-      platform: "Windows XP"
-    },
-
-
-
-    /* CHROME */
-
-    {
-      browserName: "chrome",
-      platform: "OS X 10.8",
-      version: "beta"
-    },
-    {
-      browserName: "chrome",
-      platform: "Windows 8.1",
-      version: "beta"
-    },
-    {
-      browserName: "chrome",
-      platform: "Windows 8",
-      version: "beta"
-    },
-
-
-    {
-      browserName: "chrome",
-      platform: "OS X 10.9"
-    },
-    {
-      browserName: "chrome",
-      platform: "OS X 10.8"
-    },
-    {
-      browserName: "chrome",
-      platform: "OS X 10.6"
-    },
-    {
-      browserName: 'chrome',
-      platform: 'Windows 8.1'
-    },
-    {
-      browserName: 'chrome',
-      platform: 'Windows 8'
-    },
-    {
-      browserName: "chrome",
-      platform: "Windows 7"
-    },
-    {
-      browserName: "chrome",
-      platform: "Windows XP"
-    },
-    {
-      browserName: "chrome",
-      platform: "Linux"
-    },
-
-
-    /* SAFARI */
-    {
-      browserName: "safari",
-      platform: "OS X 10.9",
-      version: "7"
-    },
-    {
-      browserName: "safari",
-      platform: "OS X 10.8",
-      version: "6"
-    },
-    {
-      browserName: "safari",
-      platform: "OS X 10.6",
-      version: "5"
-    },
-
-
-
-    /* Internet Explorer */
-
-    {
-      browserName: "internet explorer",
-      platform: "Windows 8.1",
-      version: "11"
-    },
-
-    {
-      browserName: "internet explorer",
-      platform: "Windows 8",
-      version: "10"
-    },
-
-
-    {
-      browserName: "internet explorer",
-      platform: "WINDOWS 7",
-      version: "11"
-    },
-    {
-      browserName: 'internet explorer',
-      platform: 'Windows 7',
-      version: '10'
-    },
-    {
-      browserName: "internet explorer",
-      platform: "WINDOWS 7",
-      version: "9"
-    },
-
-    // Testing framework not supported :\
-
-    // {
-    //   browserName: "internet explorer",
-    //   platform: "WINDOWS 7",
-    //   version: "8"
-    // }
-
-    // {
-    //   browserName: "internet explorer",
-    //   platform: "Windows XP",
-    //   version: "8"
-    // },
-    // {
-    //   browserName: "internet explorer",
-    //   platform: "Windows XP",
-    //   version: "7"
-    // },
-    // {
-    //   browserName: "internet explorer",
-    //   platform: "Windows XP",
-    //   version: "6"
-    // }
-
-    /* iOS */
-
-    {
-      browserName: "iphone",
-      platform: "OS X 10.9",
-      version: "7.1",
-      deviceName: "iPhone"
-    },
-    // {
-    //   browserName: "iphone",
-    //   platform: "OS X 10.9",
-    //   version: "7.0",
-    //   deviceName: "iPhone"
-    // },
-    {
-      browserName: "iphone",
-      platform: "OS X 10.8",
-      version: "6.1",
-      deviceName: "iPhone"
-    },
-    // {
-    //   browserName: "iphone",
-    //   platform: "OS X 10.8",
-    //   version: "6.0",
-    //   deviceName: "iPhone"
-    // },
-
-
-    /* Android */
-
-    {
-      browserName: "android",
-      platform: "Linux",
-      version: "4.4"
-    },
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.4",
-    //   deviceName: "Google Nexus 7 HD Emulator"
-    // },
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.4",
-    //   deviceName: "LG Nexus 4 Emulator"
-    // },
-
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.3"
-    // },
-
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.2"
-    // },
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.2",
-    //   deviceName: "Samsung Galaxy Tab 3 Emulator"
-    // },
-
-    {
-      browserName: "android",
-      platform: "Linux",
-      version: "4.1"
-    },
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.1",
-    //   deviceName: "Samsung Galaxy Note Emulator"
-    // },
-    //
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.0",
-    //   deviceName: "Motorola Droid 4 Emulator"
-    // },
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.0",
-    //   deviceName: "Samsung Galaxy Nexus Emulator"
-    // },
-    // {
-    //   browserName: "android",
-    //   platform: "Linux",
-    //   version: "4.0",
-    //   deviceName: "Samsung Galaxy Note Emulator"
-    // }
-
-  ];
-
-  return this;
-};
diff --git a/config/wrappers.js b/config/wrappers.js
deleted file mode 100644
index d613cce..0000000
--- a/config/wrappers.js
+++ /dev/null
@@ -1,41 +0,0 @@
-module.exports = function(){
-  return {
-
-    libraryBanner: '!function(name, context, definition){' +
-        'if (typeof define == "function" && define.amd) {' +
-          'define("keen", [], function(lib){ return definition(); });' +
-        '}' +
-        'if ( typeof module === "object" && typeof module.exports === "object" ) {' +
-          'module.exports = definition();' +
-        '} else {' +
-          'context[name] = definition();' +
-        '}' +
-      '}("Keen", this, function(Keen) {' +
-        '"use strict";\n\n',
-
-    libraryFooter: 'if (Keen.loaded) {' +
-        'setTimeout(function(){' +
-          'Keen.utils.domready(function(){' +
-            'Keen.trigger("ready");' +
-          '});' +
-        '}, 0);' +
-      '}' +
-      '_loadAsync();' +
-      '\n\nreturn Keen; \n\n});',
-
-    adapterBanner: '!function(name, context, definition){' +
-        'if (typeof define == "function" && define.amd) {' +
-          'define(["keen"], function(lib){ definition(lib); });' +
-        '}' +
-        'if ( typeof module === "object" && typeof module.exports === "object" ) {' +
-          'module.exports = definition();' +
-        '} else {' +
-          'definition(context[name]);' +
-        '}' +
-      '}("Keen", this, function(Keen) {' +
-        '"use strict";\n\n',
-
-    adapterFooter: '\n\nreturn Keen; \n\n});'
-
-  }
-};
diff --git a/docs/README.md b/docs/README.md
index 62b249b..e1e4869 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -2,21 +2,20 @@
 
 If you haven’t done so already, [login to Keen IO to create a project](https://keen.io/add-project) for your app. The Project ID and API Keys are available on the Project Overview page. You will need these for the next steps.
 
-
 ## Install the library
 
 Load this library asynchronously from our CDN by copy/pasting this snippet of JavaScript above the `</head>` tag of your page.
 
 ```html
 <script type="text/javascript">
-  !function(a,b){a("Keen","https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js",b)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
+  !function(a,b){a("Keen","https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js",b)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
 </script>
 ```
 
 Alternatively, you can load the library synchronously from our CDN:
 
 ```html
-<script src="https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js"></script>
+<script src="https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js"></script>
 ```
 
 Read our [Installation guide](./installation.md) to learn about all the ways this library can fit into your workflow.
diff --git a/docs/dataset.md b/docs/dataset.md
index 7bf476a..2b06f3a 100644
--- a/docs/dataset.md
+++ b/docs/dataset.md
@@ -1,5 +1,25 @@
 # Keen.Dataset
 
+Every instance of `Keen.Dataviz` manages its own internal instance of `Keen.Dataset`. These methods can be called directly for advanced manipulation of data at any point in the visualization process.
+
+```javascript
+var chart = new Keen.Dataset();
+
+// Parses raw data into a new internal Dataset instance
+chart
+  .parseRawData({ result: 2450 });
+
+chart
+  .call(function(){
+    // Modify internal Dataset instance
+    this.dataset.updateColumn(1, function(value, index, column){
+      return value / 100;
+    });
+  })
+  .render();
+
+```
+
 ## Create a new Dataset instance
 
 ```javascript
diff --git a/docs/dataviz.md b/docs/dataviz.md
index b832d92..e3bbab9 100644
--- a/docs/dataviz.md
+++ b/docs/dataviz.md
@@ -17,12 +17,18 @@ chart
   .sortGroups("desc")
   .prepare();
 
-client.run(query, function(){
+var req = client.run(query, function(){
   chart
     .parseRequest(this)
     .render();
 });
 
+// let's update this chart every 10 seconds
+setInterval(function(){
+  chart.prepare(); // restart the spinner
+  req.refresh();
+}, 10*1000);
+
 ```
 
 ## DOM Element
diff --git a/docs/installation.md b/docs/installation.md
index 51d7e07..975b9c2 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -1,16 +1,23 @@
 # Installation
 
-## Asynchronous Loading
 
-Copy+paste this snippet of JavaScript above the `</head>` tag of your page.
+```ssh
+# via npm
+$ npm install keen-js
+
+# or bower
+$ bower install keen-js
+```
+
+For quick browser use, copy/paste this snippet of JavaScript above the `</head>` tag of your page:
 
 ```html
 <script type="text/javascript">
-  !function(a,b){a("Keen","https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js",b)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
+!function(a,b){a("Keen","https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js",b)}(function(a,b,c){var d,e,f;c["_"+a]={},c[a]=function(b){c["_"+a].clients=c["_"+a].clients||{},c["_"+a].clients[b.projectId]=this,this._config=b},c[a].ready=function(b){c["_"+a].ready=c["_"+a].ready||[],c["_"+a].ready.push(b)},d=["addEvent","setGlobalProperties","trackExternalLink","on"];for(var g=0;g<d.length;g++){var h=d[g],i=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};c[a].prototype[h]=i(h)}e=document.createElement("script"),e.async=!0,e.src=b,f=document.getElementsByTagName("script")[0],f.parentNode.insertBefore(e,f)},this);
 </script>
 ```
 
-`addEvent`, `setGlobalProperties`, `trackExternalLink` and `ready` methods are available immediately, but data will be cached locally. Once the library has loaded, any methods you have called will be "replayed" and cached data will be sent to our service.
+`addEvent`, `setGlobalProperties`, and `trackExternalLink` methods are available immediately, but data will be cached locally. Once the library has loaded, any methods you have called will be "replayed" and cached data will be sent to our service.
 
 ```javascript
 // paste async code snippet here
@@ -23,7 +30,7 @@ client.addEvent("pageview", { key: "value" });
 
 ### Keen.ready(fn)
 
-Unlike the core `Keen` object and its tracking-related methods, `Keen.Query`, `Keen.Visualization`, `Keen.Dataviz` and `Keen.Dataset` won't be available until the library has finished loading. Use our ready callback, `Keen.ready()`, to safely wrap any references to these objects. 
+Unlike the core `Keen` object and its tracking-related methods, `Keen.Query`, `Keen.Visualization`, `Keen.Dataviz` and `Keen.Dataset` won't be available until the library has finished loading. Use our ready callback, `Keen.ready()`, to safely wrap any references to these objects.
 
 ```javascript
 Keen.ready(function(){
@@ -42,25 +49,17 @@ Keen.ready(function(){
 
 Simple, synchronous loading.
 
-**Specified version:** (recommended)
-
-```html
-<script src="https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen.min.js" type="text/javascript"></script>
-```
-
-**Latest build:**
-
 ```html
-<script src="https://d26b395fwzu5fz.cloudfront.net/latest/keen.min.js" type="text/javascript"></script>
+<script src="https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js" type="text/javascript"></script>
 ```
 
-## Bower
-
-If you're using [Bower](http://bower.io/), you can load this library into your project with the following command:
+## Tracking-only
 
-`$ bower install keen-js`
+If you only need to track events, replace the URLs in your installation with this version:
 
-Full and tracking-only versions of the library will be retrieved.
+```
+https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen-tracker.min.js
+```
 
 ## AMD/CommonJS
 
@@ -73,51 +72,10 @@ The library is loaded with an explicitly named module ID ("keen"), which present
 ```javascript
 requirejs.config({
   "paths": {
-    "keen": "https://d26b395fwzu5fz.cloudfront.net/latest/keen.js"
+    "keen": "https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.js"
   }
 });
 require([ "keen" ], function(Keen) {
   var client = new Keen({ ... });
 });
 ```
-
-## Tracking-only
-
-If you only need to track events, replace the URLs in your installation with this version:
-
-```
-https://d26b395fwzu5fz.cloudfront.net/3.1.0/keen-tracker.min.js
-```
-
-or for the latest version:
-
-```
-https://d26b395fwzu5fz.cloudfront.net/latest/keen-tracker.min.js
-```
-
-For production implementations, we highly recommend sticking with a specific version of the library, rather than `latest/`, to ensure future changes won't cause unforeseen issues.
-
-
-## Custom Builds
-
-Build your own custom versions of this library with [Grunt](http://gruntjs.com/getting-started) (requires Node.js/npm).
-
-```bash
-$ git clone https://github.com/keenlabs/keen-js.git && cd keen-js
-$ npm install
-$ bower install
-$ grunt build
-```
-
-Built files will be placed in the `dist` directory.
-
-
-### Test Coverage
-
-Fire up the test server
-
-```bash
-$ grunt dev
-```
-
-Results are available at `http://localhost:9999`
diff --git a/docs/meta.md b/docs/meta.md
new file mode 100644
index 0000000..eb030b0
--- /dev/null
+++ b/docs/meta.md
@@ -0,0 +1,125 @@
+# Access Meta Data
+
+## All collections
+
+Retrieve schemas for all collections in a project
+
+```javascript
+var client = new Keen({
+  projectId: "YOUR_PROJECT_ID",
+  masterKey: "YOUR_MASTER_KEY"
+});
+
+var url = client.url("/events");
+// returns https://api.keen.io/3.0/projects/YOUR_PROJECT_ID/events
+
+client.get(url, null, client.masterKey(), function(err, res){
+  // if (err) handle the error
+  console.log("Returned schema info for " + res.length + " collections");
+});
+```
+
+Each collection will return a result that looks like this:
+
+```json
+{
+  "name": "pageview",
+  "properties": {
+    "keen.created_at": "datetime",
+    "keen.id": "string",
+    "keen.timestamp": "datetime",
+    "another_property": "string",
+    "etc": "string"
+  },
+  "url": "/3.0/projects/<YOUR_PROJECT_ID>/events/<COLLECTION_NAME>"
+}
+```
+
+
+## Single collection
+
+```javascript
+var client = new Keen({
+  projectId: "YOUR_PROJECT_ID",
+  masterKey: "YOUR_MASTER_KEY"
+});
+var url = client.get("/events/purchases");
+// returns https://api.keen.io/3.0/projects/YOUR_PROJECT_ID/events/purchases
+
+client.get(url, null, client.masterKey(), function(err, res){
+  // if (err) handle the error
+  console.log(res);
+});
+```
+
+The response will look like this:
+
+```json
+{
+  "properties": {
+    "keen.created_at": "datetime",
+    "keen.id": "string",
+    "keen.timestamp": "datetime",
+    "another_property": "string",
+    "etc": "string"
+  }
+
+}
+```
+
+
+## All properties from a collection
+
+```javascript
+var client = new Keen({
+  projectId: "YOUR_PROJECT_ID",
+  masterKey: "YOUR_MASTER_KEY"
+});
+var url = client.get("/events/purchases/properties");
+// returns https://api.keen.io/3.0/projects/YOUR_PROJECT_ID/events/purchases/properties
+
+client.get(url, null, client.masterKey(), function(err, res){
+  // if (err) handle the error
+  console.log("Returned property info for " + res.length + " properties");
+});
+```
+
+The response will include an array of objects that look like this:
+
+```json
+[
+  {
+    "property_name": "keen.id",
+    "type": "string",
+    "url": "/3.0/projects/YOUR_PROJECT_ID/events/purchases/properties/keen.id"
+  },
+  {},
+  {}
+]
+```
+
+## Single property from a collection
+
+```javascript
+var client = new Keen({
+  projectId: "YOUR_PROJECT_ID",
+  masterKey: "YOUR_MASTER_KEY"
+});
+var url = client.get("/events/purchases/properties/keen.id");
+// returns https://api.keen.io/3.0/projects/YOUR_PROJECT_ID/events/purchases/properties
+
+client.get(url, null, client.masterKey(), function(err, res){
+  // if (err) handle the error
+  console.log(res);
+});
+```
+
+The response will look like this (same as a single result from the previous example):
+
+```json
+{
+  "property_name": "keen.id",
+  "type": "string",
+  "url": "/3.0/projects/YOUR_PROJECT_ID/events/purchases/properties/keen.id"
+}
+```
diff --git a/docs/query.md b/docs/query.md
index 1a348de..5d24ebd 100644
--- a/docs/query.md
+++ b/docs/query.md
@@ -42,7 +42,7 @@ var your_analysis = new Keen.Query(analysisType, params);
     });
 
     // Send query
-    client.run(count, function(response){
+    client.run(count, function(err, response){
       // Print the query result to the console
       console.log(response);
     });
@@ -106,7 +106,7 @@ var max_revenue = new Keen.Query("maximum", {
   groupBy: "geo.country"
 });
 
-var mashup = client.run([avg_revenue, max_revenue], function(res){
+var mashup = client.run([avg_revenue, max_revenue], function(err, res){
   // res[0].result or this.data[0] (avg_revenue)
   // res[1].result or this.data[1] (max_revenue)
 });  
diff --git a/docs/recipes.md b/docs/recipes.md
index 741252b..bf937c1 100644
--- a/docs/recipes.md
+++ b/docs/recipes.md
@@ -27,7 +27,19 @@ var uniqueVisitors = new Keen.Query("count_unique", { // second query
 	timeframe: timeframe
 });
 
-client.run([pageviews, uniqueVisitors], function(response){ // run the queries
+var chart = new Keen.Dataviz()
+	.el(document.getElementById("pageviews"))
+	.chartType("linechart")
+	.chartOptions({
+		hAxis: {
+			format:'MMM d',
+			gridlines:  {count: 12}
+		}
+	})
+	.prepare();
+
+client.run([pageviews, uniqueVisitors], function(err, response){ // run the queries
+	// if (err) handle the error
 
 	var result1 = response[0].result  // data from first query
 	var result2 = response[1].result  // data from second query
@@ -43,17 +55,11 @@ client.run([pageviews, uniqueVisitors], function(response){ // run the queries
 				{ category: "Visitors", result: result2[i]["value"] }
 			]
 		}
-		if (i == result1.length-1) { // chart the data
-			window.chart = new Keen.Visualization({result: data}, document.getElementById('pageviews'), {
-				chartType: "linechart",
-				title: " ",
-				chartOptions: {
-					hAxis: {
-						format:'MMM d',
-						gridlines:  {count: 12}
-					}
-				}
-			});
+		if (i == result1.length-1) {
+			// chart the data
+			chart
+				.parseRawData({ result: data })
+				.render();
 		}
 		i++;
 	}
@@ -91,7 +97,19 @@ Keen.ready(function(){
     timeframe: timeframe
   });
 
-  client.run([posts, uniquePosters], function(response){ // run the queries
+	var chart = new Keen.Dataviz()
+		.el(document.getElementById("chart1"))
+		.chartType("linechart")
+		.chartOptions({
+			lineWidth: 3,
+			hAxis: {
+				format:'MMM d',
+				gridlines:  {count: 12}
+			}
+		})
+		.prepare();
+
+  client.run([posts, uniquePosters], function(err, response){ // run the queries
 
     var result1 = response[0].result  // data from first query
     var result2 = response[1].result  // data from second query
@@ -106,18 +124,11 @@ Keen.ready(function(){
           { category: "Posts per peep", result: result1[i]["value"] / result2[i]["value"]}
         ]
       }
-      if (i == result1.length-1) { // chart the data
-        window.chart = new Keen.Visualization({result: data}, document.getElementById('chart1'), {
-          chartType: "linechart",
-          title: " ",
-          chartOptions: {
-            lineWidth: 3,
-            hAxis: {
-              format:'MMM d',
-              gridlines:  {count: 12}
-            }
-          }
-        });
+      if (i == result1.length-1) {
+				// chart the data
+				chart
+					.parseRawData({ result: data })
+					.render();
       }
       i++;
     }
@@ -142,7 +153,7 @@ Each data point on the line chart tells you what percentage of users who signed
 <html lang='en'>
 <head>
   <script src='https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.js'></script>
-  <script src="https://d26b395fwzu5fz.cloudfront.net/latest/keen.min.js"></script>
+  <script src="https://d26b395fwzu5fz.cloudfront.net/3.2.0/keen.min.js"></script>
   <script>
 
     var client = new Keen({
@@ -169,6 +180,19 @@ Each data point on the line chart tells you what percentage of users who signed
       var retentionPeriod = 30;
       var div = "chart1";
 
+			var chart = new Keen.Dataviz()
+				.chartType("linechart")
+				.colors(["#6ab975"])
+				.el(document.getElementById(div))
+				.title("New users still using the app " + retentionPeriod + " days later")
+				.width(600)
+				.chartOptions({
+					legend: { position: "none" },
+					vAxis: { format: '#,###.#%' },
+					hAxis: { format:'MMM d'}
+				})
+				.prepare();
+
       calculateRetention(daysInChart, step1CollectionName, step2CollectionName, retentionPeriod, actorProperty, div);
     });
 
@@ -216,7 +240,7 @@ Each data point on the line chart tells you what percentage of users who signed
 
           var funnel = new Keen.Query('funnel', {steps: [step1, step2]});
 
-          client.run(funnel, function(response){
+          client.run(funnel, function(err, response){
             var percentage = response.result[1]/response.result[0]
             dataForLineChart.push({
               "value" : percentage,
@@ -228,25 +252,17 @@ Each data point on the line chart tells you what percentage of users who signed
 
             if (dataForLineChart.length == daysInChart) {
 
-            // Need to sort data for line chart!
-            dataForLineChart.sort(function(x, y){
-              date1 = new Date(x.timeframe["start"]);
-              date2 = new Date(y.timeframe["start"]);
-              return date1 - date2;
-            })
-
-            // draw it!
-            window.chart = new Keen.Visualization({result: dataForLineChart}, document.getElementById(div), {
-              chartType: 'linechart',
-              title: "New users still using the app " + retentionPeriod + " days later",
-              width: 600,
-              colors: ['#6ab975'],
-              chartOptions: {
-                legend: { position: "none" },
-                vAxis: { format: '#,###.#%' },
-                hAxis: { format:'MMM d'}
-              }
-            });
+	            // Need to sort data for line chart!
+	            dataForLineChart.sort(function(x, y){
+	              date1 = new Date(x.timeframe["start"]);
+	              date2 = new Date(y.timeframe["start"]);
+	              return date1 - date2;
+	            })
+
+	            // draw it!
+							chart
+								.parseRawData({ result: dataForLineChart })
+								.render();
             }
           });
 
diff --git a/docs/scoped-keys.md b/docs/scoped-keys.md
new file mode 100644
index 0000000..e29bf86
--- /dev/null
+++ b/docs/scoped-keys.md
@@ -0,0 +1,53 @@
+# Scoped Keys (server-only)
+
+Scoped keys let you safely expose data to a specific user, without giving away access to an entire event collection. This functionality is only supported on the server.
+
+Scoped Keys are generated with your Master API key. Each key defines allowed operations (read/write), along with a set of immutable filters that are applied to every request.
+
+### Configuration
+
+```json
+{
+  "allowed_operations": [ "read", "write" ],
+  "filters": [
+    {
+      "property_name": "account_id",
+      "operator": "eq",
+      "property_value": 123
+    }
+  ]
+}
+```
+
+## Create a scoped key
+
+```javascript
+var Keen = require("keen-js");
+var apiKey = "YOUR_MASTER_KEY";
+
+var scopedKey = Keen.utils.encryptScopedKey(apiKey, {
+  "allowed_operations": ["read"],
+  "filters": [{
+    "property_name": "account.id",
+    "operator": "eq",
+    "property_value": "123"
+  }]
+});
+
+// Do something with this new scoped key
+var client = Keen.configure({
+  projectId: "<project_id>";
+  readKey: scopedKey
+});
+```
+
+## Decrypt a scoped key
+
+```javascript
+var Keen = require("keen-js");
+var apiKey = "YOUR_MASTER_KEY";
+var scopedKey = "AN_EXISTING_SCOPED_KEY";
+
+var options = Keen.utils.decryptScopedKey(apiKey, scopedKey);
+// options will mirror configuration detailed above
+```
diff --git a/docs/track.md b/docs/track.md
index 94ab2bf..1c11cf4 100644
--- a/docs/track.md
+++ b/docs/track.md
@@ -1,7 +1,9 @@
-# Track Events
+# Record Events
 
 Hey, let's record some data!
 
+## Record a single event
+
 Here is a basic example for tracking "purchases" in your app:
 
 ```javascript
@@ -24,6 +26,28 @@ client.addEvent("purchases", purchase);
 
 Send as many events as you like. Each event will be fired off to the Keen IO servers asynchronously.
 
+## Record multiple events
+
+```javascript
+// Configure an instance for your project
+var client = new Keen({...});
+
+// Send multiple events to several collections
+client.addEvents({
+  "purchases": [
+    { item: "golden gadget", price: 25.50, transaction_id: "f029342" },
+    { item: "a different gadget", price: 17.75, transaction_id: "f029342" }
+  ],
+  "transactions": [
+    {
+      id: "f029342",
+      items: 2,
+      total: 43.25
+    }
+  ]
+});
+```
+
 ## A few simple guidelines
 
 **Property names** must follow these rules:
diff --git a/docs/visualization.md b/docs/visualization.md
index 848edb0..60e94c1 100644
--- a/docs/visualization.md
+++ b/docs/visualization.md
@@ -10,23 +10,6 @@ Clients have a #draw method with accepts a query, a DOM selector, and a configur
 client.draw(query, selector, config);
 ```
 
-Charts can also be instantiated with the `Keen.Visualization` class. Just be sure to include the `library` (default is `google`) and `chartType` properties with the chart configuration.
-
-```javascript
-client.run(query, function(response){
-  var newData = response;
-  response.result = response.result / 100;
-  this.data = newData;
-
-  // Pass in raw data, or reference to "this" (request instance)
-  var myChart = new Keen.Visualization(this, document.getElementById("chart-wrapper"), {
-    library: "google",
-    chartType: "columnchart",
-    title: "Custom chart title"
-  });
-});
-```
-
 ## Example usage
 
 ```javascript
@@ -40,51 +23,48 @@ var chart = client.draw(count, document.getElementById("chart-wrapper"), {
   title: "Custom chart title",
   chartType: "columnchart"
 });
+```
 
-// or
+Charts can also be instantiated with the `Keen.Dataviz` object. Learn more about this object [here](./dataviz.md).
 
-var chart;
-var req = client.run(count, function(){
-  if (chart) chart.remove();
-  // Pass in raw data, or reference to "this" (request instance)
-  chart = new Keen.Visualization(this, document.getElementById("chart-wrapper"), {
-    title: "Custom chart title",
-    chartType: "columnchart"
-  });
+```javascript
+var chart = new Keen.Dataviz()
+  .el(document.getElementById("chart-wrapper"))
+  .chartType("columnchart")
+  .title("Custom chart title")
+  .prepare(); // start spinner
+
+client.run(query, function(response){
+  chart.parseRequest(this).render();
 });
 ```
 
 ## DOM Selector
 
-The first argument for the `#draw` method is a reference to the DOM element where your chart will appear. This should be a block level element, like a `<div>` tag, referenced by its ID attribute:
+The second argument for the `#draw` method is a reference to the DOM element where your chart will appear. This should be a block level element, like a `<div>` tag, referenced by its ID attribute:
 
 `document.getElementById("chart-wrapper")`
 
-
 ## Configuration
 
-Configuration options and their defaults:
-
 ```javascript
 {
-  colors: [ "#ff0000", "#222", "lightblue" ], //
-  title: "",		// string or null
-  height: 400,		// integer
-  width: 600,		// integer or "auto"
-  labelMapping: {},	// read below
-  colorMapping: {},	// read below
+  colors: [ "#ff0000", "#222", "lightblue" ],
+  title: "My chart title!",
+  height: 400,
+  width: 600,
+  colorMapping: {},
+  labelMapping: {},
+  labels: [],
   chartOptions: {
-  	// pass directly through to underying vizz library
+    // pass directly through to underying vizz library
   }
 }
 ```
 
-
 ### Customized Labels
 
-`labelMapping`: object or array that replaces incoming labels with desired values.
-
-**Selective replacement:**
+`labelMapping`: object that selectively replaces previous values with desired values:
 
 ```javascript
 labelMapping: {
@@ -93,11 +73,11 @@ labelMapping: {
 }
 ```
 
-**Total replacement:**
+`labels`: array that totally replaces all values (useful for funnels):
 
 ```javascript
 {
-  labelMapping: [
+  labels: [
     "Step 1",
     "Step 2 (75%)",
     "Step 3 (50%)",
@@ -302,7 +282,7 @@ Find additional configuration options for tables [here](https://developers.googl
 
 ### Funnels
 
-[Funnels](https://keen.io/docs/data-analysis/funnels/) are a fancy analysis type that allow you to see what percentage of users (or devices) complete various steps. 
+[Funnels](https://keen.io/docs/data-analysis/funnels/) are a fancy analysis type that allow you to see what percentage of users (or devices) complete various steps.
 
 
 ![Funnel as a bar chart](img/funnel-barchart.png)
@@ -368,17 +348,18 @@ client.draw(watch_activation_funnel, document.getElementById("chart-05"), {
 
 ## Pass in your own data to charts
 
-To display a modified query result or data from another source into a visualization, pass a result object and a div to Keen.Visualization. The [Keen IO API docs](https://keen.io/docs/data-analysis/) describe what the results look like for all the different query types (counts, series, funnels, etc).
+To display a modified query result or data from another source into a visualization, pass a result object and a div to Keen.Dataviz. The [Keen IO API docs](https://keen.io/docs/data-analysis/) describe what the results look like for all the different query types (counts, series, funnels, etc).
 
 Here's an example that takes a hard-coded value "1896" and draws it as a number.
 
 ```javascript
-  window.chart = new Keen.Visualization({result: 1896}, document.getElementById('my-div'), {
-    chartType: 'metric',
-    title: "Wow!",
-    width: 400,
-    colors: ['#6ab975']
- });
+  var chart = new Keen.Dataviz()
+    .el(document.getElementById('my-div'))
+    .chartType("metric")
+    .colors(["#6ab975"])
+    .title("Wow!")
+    .width(400)
+    .render();
 ```
 
 ## Combine results of two queries
@@ -399,16 +380,19 @@ Here's an example that runs two queries, divides them, and then outputs the resu
     timeframe: "last_7_days"
   });
 
+  var chart = Keen.Dataviz()
+    .el(document.getElementById("paid-session-conversion"))
+    .colors(["#6ab975"])
+    .title("Conversion %")
+    .width(400)
+    .prepare(); // start spinner
+
   var mashup = client.run([sessions_count, paid_sessions_count], function(res){  // Send query to Keen IO
     // divide paid sessions by sessions to get conversion rate
     var conversion_rate = (this.data[1].result/this.data[0].result).toFixed(2)*100
-
-    window.chart = new Keen.Visualization({result: conversion_rate}, document.getElementById('paid-session-conversion'), {
-      chartType: 'metric',
-      title: "Conversion %",
-      width: 400,
-      colors: ['#6ab975']
-    });
+    chart
+      .parseRawData({ result: conversion_rate })
+      .render();
   });
 
 ```
@@ -437,6 +421,16 @@ var uniqueVisitors = new Keen.Query("count_unique", { // second query
 	timeframe: timeframe
 });
 
+var chart = Keen.Dataviz()
+  .chartType("linechart")
+  .chartOptions({
+    hAxis: {
+      format:'MMM d',
+      gridlines:  {count: 12}
+    }
+  })
+  .prepare();
+
 client.run([pageviews, uniqueVisitors], function(response){ // run the queries
 
 	var result1 = response[0].result  // data from first query
@@ -454,16 +448,9 @@ client.run([pageviews, uniqueVisitors], function(response){ // run the queries
 			]
 		}
 		if (i == result1.length-1) { // chart the data
-			window.chart = new Keen.Visualization({result: data}, document.getElementById('pageviews'), {
-				chartType: "linechart",
-				title: " ",
-				chartOptions: {
-					hAxis: {
-						format:'MMM d',
-						gridlines:  {count: 12}
-					}
-				}
-			});
+      chart
+        .parseRawData({ result: data })
+        .render();
 		}
 		i++;
 	}
diff --git a/gulpfile.js b/gulpfile.js
new file mode 100644
index 0000000..f258ba6
--- /dev/null
+++ b/gulpfile.js
@@ -0,0 +1,336 @@
+var gulp = require("gulp"),
+    pkg = require("./package.json");
+
+var aws = require("gulp-awspublish"),
+    browserify = require("browserify"),
+    connect = require("gulp-connect"),
+    compress = require("gulp-yuicompressor"),
+    del = require("del"),
+    karma = require("karma").server,
+    mocha = require("gulp-mocha"),
+    mochaPhantomJS = require("gulp-mocha-phantomjs"),
+    moment = require("moment"),
+    rename = require("gulp-rename"),
+    runSequence = require("run-sequence"),
+    source = require("vinyl-source-stream");
+
+var wrap = require("./src/wrappers/gulpTask");
+
+// -------------------------
+// Build tasks
+// -------------------------
+
+gulp.task("build", function(callback) {
+  return runSequence(
+      "build:wrap",
+      "build:browserify",
+      "build:clean",
+      "compress",
+      callback
+    );
+});
+
+gulp.task("build:browserify", function(callback){
+  return runSequence("browserify:complete", "browserify:tracker", callback);
+});
+
+gulp.task("build:wrap", function(){
+  return gulp.src(["./src/keen.js", "./src/keen-tracker.js"])
+    .pipe(wrap("./library.js"))
+    .pipe(rename({ extname: ".tmp" }))
+    .pipe(gulp.dest("./src/"));
+});
+
+gulp.task("browserify:complete", function() {
+  return browserify("./src/keen.tmp")
+    .bundle()
+    .pipe(source("keen.js"))
+    .pipe(gulp.dest("./dist/"));
+});
+
+gulp.task("browserify:tracker", function() {
+  return browserify("./src/keen-tracker.tmp")
+    .bundle()
+    .pipe(source("keen-tracker.js"))
+    .pipe(gulp.dest("./dist/"));
+});
+
+gulp.task("build:clean", function(callback) {
+  del(["./src/*.tmp"], callback);
+});
+
+gulp.task("compress", function(){
+  return gulp.src([
+      "./dist/keen.js",
+      "./dist/keen-tracker.js",
+      "./src/loader.js"
+    ])
+    .pipe(compress({ type: "js" }))
+    .pipe(rename({ suffix: ".min" }))
+    .pipe(gulp.dest("./dist/"));
+});
+
+gulp.task("connect", function () {
+  return connect.server({
+      root: [ __dirname, "test", "test/unit", "test/vendor", "test/examples" ],
+      port: 9999
+    });
+});
+
+gulp.task("watch", function() {
+  return gulp.watch([
+      "src/**/*.js",
+      "gulpfile.js"
+    ], ["build"]);
+});
+
+gulp.task("watch-with-tests", function() {
+  return gulp.watch([
+      "src/**/*.js",
+      "test/unit/**/*.*",
+      "gulpfile.js"
+    ], ["build", "test:server", "test:phantom"]);
+});
+
+
+// -------------------------
+// Test tasks
+// -------------------------
+
+gulp.task("test:server", function () {
+  return gulp.src("./test/unit/server.js", { read: false })
+    .pipe(mocha({ reporter: "nyan" }));
+});
+
+gulp.task("test:unit:clean", function (callback) {
+  del(["./test/unit/build"], callback);
+});
+
+gulp.task("test:unit:build", function () {
+  return browserify("./test/unit/index.js", {
+      insertGlobals: true,
+      debug: true
+    })
+    .bundle()
+    .pipe(source("browserified-tests.js"))
+    .pipe(gulp.dest("./test/unit/build"));
+});
+
+gulp.task("test:unit:phantom", function () {
+  return gulp.src("./test/unit/index.html")
+    .pipe(mochaPhantomJS());
+});
+
+gulp.task("test:unit:karma", function (done){
+  karma.start({
+    configFile: __dirname + "/karma.conf.js",
+    singleRun: true
+  }, done);
+});
+
+gulp.task("test:unit:sauce", function(){
+  karma.start({
+    browsers: Object.keys(getCustomLaunchers()),
+    browserDisconnectTimeout: 10 * 1000,
+    browserDisconnectTolerance: 3,
+    browserNoActivityTimeout: 20 * 1000,
+    captureTimeout: 300 * 1000,
+    configFile : __dirname + "/karma.conf.js",
+    customLaunchers: getCustomLaunchers(),
+    logColors: true,
+    reporters: [ "saucelabs" ],
+    sauceLabs: {
+      testName: moment().format("ddd, MMM Do, h:mm:ss a"),
+      recordScreenshots: false,
+      recordVideo: false,
+
+    },
+    singleRun  : true,
+    action     : "run"
+  });
+});
+
+
+// -------------------------
+// Test bundles
+// -------------------------
+
+gulp.task("test:prepare", function (callback) {
+  runSequence(
+    "test:unit:clean",
+    "test:unit:build",
+    callback
+  );
+});
+
+gulp.task("test:phantom", function (callback) {
+  runSequence(
+    "test:prepare",
+    "test:unit:phantom",
+    callback
+  );
+});
+
+gulp.task("test:karma", function (callback){
+  runSequence(
+    "test:prepare",
+    "test:unit:karma",
+    callback
+  );
+});
+
+gulp.task("test:sauce", function(callback){
+  runSequence(
+    "test:prepare",
+    "test:unit:sauce",
+    callback
+  );
+});
+
+gulp.task("test:local", function(callback) {
+  runSequence(
+    // Node.js tests
+    "test:server",
+    // Browser tests
+    "test:phantom",
+    "test:karma",
+    callback
+  );
+});
+
+gulp.task("test:all", function(callback) {
+  runSequence(
+    "test:local",
+    "test:sauce",
+    callback
+  );
+});
+
+gulp.task("test:ci", function(callback) {
+  runSequence(
+    "test:server",
+    "test:phantom",
+    "test:sauce",
+    callback
+  );
+});
+
+
+
+
+// -------------------------
+// Deployment task
+// -------------------------
+
+gulp.task("deploy", function(callback){
+  runSequence(
+    "build",
+    "test:local",
+    "aws",
+    callback
+  );
+});
+
+gulp.task("aws", function() {
+
+  if (!process.env.AWS_KEY || !process.env.AWS_SECRET) {
+    throw "AWS credentials are required!";
+  }
+
+  var publisher = aws.create({
+    key: process.env.AWS_KEY,
+    secret: process.env.AWS_SECRET,
+    bucket: pkg.name
+  });
+
+  var headers = {
+    // Cache policy (1000 * 60 * 60 * 1) // 1 hour
+    // "Cache-Control": "max-age=3600000, public",
+    // "Expires": new Date(Date.now() + 3600000).toUTCString()
+    "Cache-Control": "max-age=1000, public",
+    "Expires": new Date(Date.now() + 1000).toUTCString()
+  };
+
+  return gulp.src([
+      "./dist/keen.js",
+      "./dist/keen.min.js",
+      "./dist/keen-tracker.js",
+      "./dist/keen-tracker.min.js"
+    ])
+    .pipe(rename(function(path) {
+      path.dirname += "/" + pkg["version"];
+    }))
+    .pipe(aws.gzip())
+    .pipe(publisher.publish(headers))
+    .pipe(publisher.cache())
+    .pipe(aws.reporter());
+
+});
+
+
+// -------------------------
+// Bundled tasks
+// -------------------------
+
+gulp.task("default", function(callback){
+  runSequence(
+    "build",
+    "connect",
+    "watch",
+    callback
+  );
+});
+
+gulp.task("with-tests", function(callback){
+  runSequence(
+    "test:local",
+    "build",
+    "connect",
+    "watch-with-tests",
+    callback
+  );
+});
+
+
+function getCustomLaunchers(){
+  return {
+    sl_ios: {
+      base: "SauceLabs",
+      browserName: "iPhone",
+      platform: "OS X 10.9",
+      version: "8.1"
+    },
+    sl_android: {
+      base: "SauceLabs",
+      browserName: "android",
+      platform: "Linux",
+      version: "4.4"
+    },
+
+    // sl_safari: {
+    //   base: "SauceLabs",
+    //   browserName: "safari",
+    //   platform: "OS X 10.10",
+    //   version: "8"
+    // },
+
+    sl_ie_11: {
+      base: "SauceLabs",
+      browserName: "internet explorer",
+      platform: "Windows 8.1",
+      version: "11"
+    },
+    sl_ie_10: {
+      base: "SauceLabs",
+      browserName: "internet explorer",
+      platform: "Windows 8",
+      version: "10"
+    },
+    sl_ie_9: {
+      base: "SauceLabs",
+      browserName: "internet explorer",
+      platform: "Windows 7",
+      version: "9"
+    }
+  };
+}
diff --git a/karma.conf.js b/karma.conf.js
new file mode 100644
index 0000000..8726d54
--- /dev/null
+++ b/karma.conf.js
@@ -0,0 +1,21 @@
+var moment = require("moment");
+
+module.exports = function(config) {
+  config.set({
+    browsers: [ "Chrome", "Firefox", "Safari" ],
+    frameworks: [ "mocha", "sinon" ],
+    files: [
+      // Include requirejs presence
+      "./test/vendor/requirejs-bower",
+      "./test/unit/build/browserified-tests.js"
+    ],
+    client: {
+      mocha: {
+        reporter: "html",
+        ui: "bdd"
+      }
+    },
+    reporters: [ "nyan" ],
+    singleRun: true
+  });
+};
diff --git a/package.json b/package.json
index db65006..7267b55 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,21 @@
 {
-  "name": "keen",
-  "version": "3.1.0",
+  "name": "keen-js",
+  "version": "3.2.0-beta",
+  "main": "src/server/index.js",
+  "browser": "src/keen.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/keen/keen-js.git"
   },
+  "scripts": {
+    "start": "gulp with-tests",
+    "test": "gulp test:ci"
+  },
   "bugs": "https://github.com/keen/keen-js/issues",
-  "author": "Dustin Larimer <dustin@keen.io> (http://keen.io/)",
+  "author": "Dustin Larimer <dustin@keen.io> (https://keen.io/)",
   "contributors": [
     "Dustin Larimer <dustin@keen.io> (https://github.com/dustinlarimer)",
-    "Sean Dokko <sean@keen.io> (http://seandokko.com/)",
+    "Sean Dokko <dokko1230@gmail.com> (http://seandokko.com/)",
     "Jordan Klassen <forivall@gmail.com> (http://forivall.github.io)",
     "Josh Dzielak <josh@keen.io> (http://dzello.com)",
     "Ryan Spraetz <ryan@keen.io> (https://keen.io)",
@@ -22,20 +28,41 @@
   "engines": {
     "node": "0.10.x"
   },
-  "scripts": {
-    "start": "grunt",
-    "test": "grunt test"
+  "dependencies": {
+    "JSON2": "^0.1.0",
+    "component-emitter": "^1.1.3",
+    "domready": "0.3.0",
+    "spin.js": "^2.0.1",
+    "superagent": "^0.21.0"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.6",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-connect": "^0.7.1",
-    "grunt-contrib-copy": "^0.5.0",
-    "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-s3": "^0.2.0-alpha.3",
-    "grunt-saucelabs": "~8.3.2",
-    "grunt-yui-compressor": "^0.3.3"
+    "browserify": "^7.0.1",
+    "chai": "^1.10.0",
+    "chai-spies": "^0.5.1",
+    "del": "^1.1.0",
+    "event-stream": "^3.1.7",
+    "gulp": "^3.8.10",
+    "gulp-awspublish": "0.0.23",
+    "gulp-connect": "^2.2.0",
+    "gulp-mocha": "^2.0.0",
+    "gulp-mocha-phantomjs": "^0.5.1",
+    "gulp-obfuscate": "^0.2.9",
+    "gulp-rename": "^1.2.0",
+    "gulp-util": "^3.0.1",
+    "gulp-yuicompressor": "0.0.3",
+    "karma": "^0.12.28",
+    "karma-chrome-launcher": "^0.1.7",
+    "karma-firefox-launcher": "^0.1.3",
+    "karma-mocha": "^0.1.10",
+    "karma-nyan-reporter": "0.0.50",
+    "karma-requirejs": "^0.2.2",
+    "karma-safari-launcher": "^0.1.1",
+    "karma-sauce-launcher": "^0.2.10",
+    "karma-sinon": "^1.0.4",
+    "lodash.template": "^2.4.1",
+    "moment": "^2.8.4",
+    "nock": "^0.51.0",
+    "run-sequence": "^1.0.2",
+    "vinyl-source-stream": "^1.0.0"
   }
 }
diff --git a/src/core/async.js b/src/core/async.js
index 6ea287d..6586aed 100644
--- a/src/core/async.js
+++ b/src/core/async.js
@@ -1,10 +1,9 @@
-// ----------------------
-// Keen IO Async Loader
-// ----------------------
+var Keen = require("./index"),
+    each = require("./utils/each");
 
-function _loadAsync(){
-  var loaded = window['Keen'],
-      cached = window['_' + 'Keen'] || {},
+module.exports = function(){
+  var loaded = window['Keen'] || null,
+      cached = window['_' + 'Keen'] || null,
       clients,
       ready;
 
@@ -12,75 +11,63 @@ function _loadAsync(){
     clients = cached['clients'] || {},
     ready = cached['ready'] || [];
 
-    for (var instance in clients) {
-      if (clients.hasOwnProperty(instance)) {
-        var client = clients[instance];
+    each(clients, function(client, id){
 
-        // Map methods to existing instances
-        for (var method in Keen.prototype) {
-          if (Keen.prototype.hasOwnProperty(method)) {
-            loaded.prototype[method] = Keen.prototype[method];
-          }
-        }
+      each(Keen.prototype, function(method, key){
+        loaded.prototype[key] = method;
+      });
 
-        // Map additional methods as necessary
-        loaded.Query = (Keen.Query) ? Keen.Query : function(){};
-        loaded.Visualization = (Keen.Visualization) ? Keen.Visualization : function(){};
+      each(["Query", "Request", "Dataset", "Dataviz"], function(name){
+        loaded[name] = (Keen[name]) ? Keen[name] : function(){};
+      });
 
-        // Run Configuration
-        if (client._config) {
-          client.configure.call(client, client._config);
-          client._config = undefined;
-          try{
-            delete client._config;
-          }catch(e){}
-        }
+      // Run config
+      if (client._config) {
+        client.configure.call(client, client._config);
+      }
 
-        // Add Global Properties
-        if (client._setGlobalProperties) {
-          var globals = client._setGlobalProperties;
-          for (var i = 0; i < globals.length; i++) {
-            client.setGlobalProperties.apply(client, globals[i]);
-          }
-          client._setGlobalProperties = undefined;
-          try{
-            delete client._setGlobalProperties;
-          }catch(e){}
-        }
+      // Add Global Properties
+      if (client._setGlobalProperties) {
+        each(client._setGlobalProperties, function(fn){
+          client.setGlobalProperties.apply(client, fn);
+        });
+      }
 
-        // Send Queued Events
-        if (client._addEvent) {
-          var queue = client._addEvent || [];
-          for (var i = 0; i < queue.length; i++) {
-            client.addEvent.apply(client, queue[i]);
-          }
-          client._addEvent = undefined;
-          try{
-            delete client._addEvent;
-          }catch(e){}
-        }
+      // Send Queued Events
+      if (client._addEvent) {
+        each(client._addEvent, function(obj){
+          client.addEvent.apply(client, obj);
+        });
+      }
+
+      // Set event listeners
+      var callback = client._on || [];
+      if (client._on) {
+        each(client._on, function(obj){
+          client.on.apply(client, obj);
+        });
+        client.trigger('ready');
+      }
 
-        // Create "on" Events
-        var callback = client._on || [];
-        if (client._on) {
-          for (var i = 0; i < callback.length; i++) {
-            client.on.apply(client, callback[i]);
-          }
-          client.trigger('ready');
-          client._on = undefined;
+      // unset config
+      each(["_config", "_setGlobalProperties", "_addEvent", "_on"], function(name){
+        if (client[name]) {
+          client[name] = undefined;
           try{
-            delete client._on;
-          }catch(e){}
+            delete client[name];
+          } catch(e){}
         }
+      });
 
-      }
-    }
+    });
 
-    for (var i = 0; i < ready.length; i++) {
-      var callback = ready[i];
-      Keen.once('ready', function(){
-        callback();
-      });
-    };
+    each(ready, function(cb, i){
+      Keen.once("ready", cb);
+    });
   }
-}
+
+  window['_' + 'Keen'] = undefined;
+  try {
+    delete window['_' + 'Keen']
+  } catch(e) {}
+};
diff --git a/src/core/events.js b/src/core/events.js
deleted file mode 100644
index 274aa29..0000000
--- a/src/core/events.js
+++ /dev/null
@@ -1,99 +0,0 @@
-//  ----------------------
-//  Keen.Events
-//  We <3 BackboneJS!
-// ----------------------
-
-var Events = Keen.Events = {
-  on: function(name, callback) {
-    this.listeners || (this.listeners = {});
-    var events = this.listeners[name] || (this.listeners[name] = []);
-    events.push({callback: callback});
-    return this;
-  },
-  once: function(name, callback, context) {
-    var self = this;
-    var once = _once(function() {
-      self.off(name, once);
-      callback.apply(this, arguments);
-    });
-    once._callback = callback;
-    return self.on(name, once, context);
-  },
-  off: function(name, callback, context) {
-    if (!this.listeners) return this;
-
-    // Remove all callbacks for all events.
-    if (!name && !callback && !context) {
-      this.listeners = void 0;
-      return this;
-    }
-
-    var names = [];
-    if (name) {
-      names.push(name);
-    } else {
-      _each(this.listeners, function(value, key){
-        names.push(key);
-      });
-    }
-
-    for (var i = 0, length = names.length; i < length; i++) {
-      name = names[i];
-
-      // Bail out if there are no events stored.
-      var events = this.listeners[name];
-      if (!events) continue;
-
-      // Remove all callbacks for this event.
-      if (!callback && !context) {
-        delete this.listeners[name];
-        continue;
-      }
-
-      // Find any remaining events.
-      var remaining = [];
-      for (var j = 0, k = events.length; j < k; j++) {
-        var event = events[j];
-        if (
-          callback && callback !== event.callback &&
-          callback !== event.callback._callback ||
-          context && context !== event.context
-        ) {
-          remaining.push(event);
-        }
-      }
-
-      // Replace events if there are any remaining.  Otherwise, clean up.
-      if (remaining.length) {
-        this.listeners[name] = remaining;
-      } else {
-        delete this.listeners[name];
-      }
-    }
-
-    return this;
-  },
-  trigger: function(name) {
-    if (!this.listeners) return this;
-    var args = Array.prototype.slice.call(arguments, 1);
-    var events = this.listeners[name] || [];
-    for (var i = 0; i < events.length; i++) {
-      events[i]['callback'].apply(this, args);
-    }
-    return this;
-  }
-};
-
-function _once(func) {
-  var ran = false, memo;
-  return function() {
-    if (ran) return memo;
-    ran = true;
-    memo = func.apply(this, arguments);
-    func = null;
-    return memo;
-  };
-}
-
-_extend(Keen.prototype, Events);
-_extend(Keen, Events);
diff --git a/src/core/helpers/emitter-shim.js b/src/core/helpers/emitter-shim.js
new file mode 100644
index 0000000..9b22494
--- /dev/null
+++ b/src/core/helpers/emitter-shim.js
@@ -0,0 +1,3 @@
+var Emitter = require('component-emitter');
+Emitter.prototype.trigger = Emitter.prototype.emit;
+module.exports = Emitter;
diff --git a/src/core/helpers/get-context.js b/src/core/helpers/get-context.js
new file mode 100644
index 0000000..af4a457
--- /dev/null
+++ b/src/core/helpers/get-context.js
@@ -0,0 +1,3 @@
+module.exports = function(){
+  return "undefined" == typeof window ? "server" : "browser";
+};
diff --git a/src/core/helpers/get-query-string.js b/src/core/helpers/get-query-string.js
new file mode 100644
index 0000000..1f020e1
--- /dev/null
+++ b/src/core/helpers/get-query-string.js
@@ -0,0 +1,14 @@
+var each = require('../utils/each'),
+    JSON2 = require('JSON2');
+
+module.exports = function(params){
+  var query = [];
+  each(params, function(value, key){
+    // if (Object.prototype.toString.call(value) !== '[object String]') {}
+    if ('string' !== typeof value) {
+      value = JSON2.stringify(value);
+    }
+    query.push(key + '=' + encodeURIComponent(value));
+  });
+  return '?' + query.join('&');
+};
diff --git a/src/core/helpers/get-timezone-offset.js b/src/core/helpers/get-timezone-offset.js
new file mode 100644
index 0000000..11945b3
--- /dev/null
+++ b/src/core/helpers/get-timezone-offset.js
@@ -0,0 +1,3 @@
+module.exports = function(){
+  return new Date().getTimezoneOffset() * -60;
+};
diff --git a/src/core/helpers/get-url-max-length.js b/src/core/helpers/get-url-max-length.js
new file mode 100644
index 0000000..0e70fbe
--- /dev/null
+++ b/src/core/helpers/get-url-max-length.js
@@ -0,0 +1,8 @@
+module.exports = function(){
+  if ("undefined" !== typeof window) {
+    if (navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0) {
+      return 2000;
+    }
+  }
+  return 16000;
+};
diff --git a/src/core/helpers/get-xhr-object.js b/src/core/helpers/get-xhr-object.js
new file mode 100644
index 0000000..c3cdc37
--- /dev/null
+++ b/src/core/helpers/get-xhr-object.js
@@ -0,0 +1,13 @@
+module.exports = function() {
+  // yay, superagent!
+  var root = "undefined" == typeof window ? this : window;
+  if (root.XMLHttpRequest && ("file:" != root.location.protocol || !root.ActiveXObject)) {
+    return new XMLHttpRequest;
+  } else {
+    try { return new ActiveXObject("Microsoft.XMLHTTP"); } catch(e) {}
+    try { return new ActiveXObject("Msxml2.XMLHTTP.6.0"); } catch(e) {}
+    try { return new ActiveXObject("Msxml2.XMLHTTP.3.0"); } catch(e) {}
+    try { return new ActiveXObject("Msxml2.XMLHTTP"); } catch(e) {}
+  }
+  return false;
+};
diff --git a/src/core/helpers/superagent-handle-response.js b/src/core/helpers/superagent-handle-response.js
new file mode 100644
index 0000000..40b0697
--- /dev/null
+++ b/src/core/helpers/superagent-handle-response.js
@@ -0,0 +1,15 @@
+module.exports = function(err, res, callback) {
+  var cb = callback || function() {};
+  if (res && !res.ok) {
+    var is_err = res.body && res.body.error_code;
+    err = new Error(is_err ? res.body.message : 'Unknown error occurred');
+    err.code = is_err ? res.body.error_code : 'UnknownError';
+  }
+  if (err) {
+    cb(err, null);
+  }
+  else {
+    cb(null, res.body);
+  }
+  return;
+};
diff --git a/src/core/helpers/superagent-request-types.js b/src/core/helpers/superagent-request-types.js
new file mode 100644
index 0000000..4098a39
--- /dev/null
+++ b/src/core/helpers/superagent-request-types.js
@@ -0,0 +1,198 @@
+var superagent = require('superagent');
+var each = require('../utils/each'),
+    getXHR = require('./get-xhr-object');
+
+module.exports = function(type, opts){
+  return function(request) {
+    var __super__ = request.constructor.prototype.end;
+    if ( 'undefined' === typeof window ) return;
+    request.requestType = request.requestType || {};
+    request.requestType['type'] = type;
+    request.requestType['options'] = request.requestType['options'] || {
+      // TODO: find acceptable default values
+      async: true,
+      success: {
+        responseText: '{ "created": true }',
+        status: 201
+      },
+      error: {
+        responseText: '{ "error_code": "ERROR", "message": "Request failed" }',
+        status: 404
+      }
+    };
+    // Apply options
+    if (opts) {
+      if ( 'boolean' === typeof opts.async ) {
+        request.requestType['options'].async = opts.async;
+      }
+      if ( opts.success ) {
+        extend(request.requestType['options'].success, opts.success);
+      }
+      if ( opts.error ) {
+        extend(request.requestType['options'].error, opts.error);
+      }
+    }
+
+    request.end = function(fn){
+      var self = this,
+          reqType = (this.requestType) ? this.requestType['type'] : 'xhr',
+          query,
+          timeout;
+
+      if ( ('GET' !== self['method'] || 'xhr' === reqType) && self.requestType['options'].async ) {
+        __super__.call(self, fn);
+        return;
+      }
+
+      query = self._query.join('&');
+      timeout = self._timeout;
+      // store callback
+      self._callback = fn || noop;
+      // timeout
+      if (timeout && !self._timer) {
+        self._timer = setTimeout(function(){
+          abortRequest.call(self);
+        }, timeout);
+      }
+      if (query) {
+        query = superagent.serializeObject(query);
+        self.url += ~self.url.indexOf('?') ? '&' + query : '?' + query;
+      }
+      // send stuff
+      self.emit('request', self);
+
+      if ( !self.requestType['options'].async ) {
+        sendXhrSync.call(self);
+      }
+      else if ( 'jsonp' === reqType ) {
+        sendJsonp.call(self);
+      }
+      else if ( 'beacon' === reqType ) {
+        sendBeacon.call(self);
+      }
+      return self;
+    };
+    return request;
+  };
+};
+
+function sendXhrSync(){
+  var xhr = getXHR();
+  if (xhr) {
+    xhr.open('GET', this.url, false);
+    xhr.send(null);
+  }
+  return this;
+}
+
+function sendJsonp(){
+  var self = this,
+      timestamp = new Date().getTime(),
+      script = document.createElement('script'),
+      parent = document.getElementsByTagName('head')[0],
+      callbackName = 'keenJSONPCallback',
+      loaded = false;
+  callbackName += timestamp;
+  while (callbackName in window) {
+    callbackName += 'a';
+  }
+  window[callbackName] = function(response) {
+    if (loaded === true) return;
+    loaded = true;
+    handleSuccess.call(self, response);
+    cleanup();
+  };
+  script.src = self.url + '&jsonp=' + callbackName;
+  parent.appendChild(script);
+  // for early IE w/ no onerror event
+  script.onreadystatechange = function() {
+    if (loaded === false && self.readyState === 'loaded') {
+      loaded = true;
+      handleError.call(self);
+      cleanup();
+    }
+  };
+  // non-ie, etc
+  script.onerror = function() {
+    // on IE9 both onerror and onreadystatechange are called
+    if (loaded === false) {
+      loaded = true;
+      handleError.call(self);
+      cleanup();
+    }
+  };
+  function cleanup(){
+    window[callbackName] = undefined;
+    try {
+      delete window[callbackName];
+    } catch(e){}
+    parent.removeChild(script);
+  }
+}
+
+function sendBeacon(){
+  var self = this,
+      img = document.createElement('img'),
+      loaded = false;
+  img.onload = function() {
+    loaded = true;
+    if ('naturalHeight' in this) {
+      if (this.naturalHeight + this.naturalWidth === 0) {
+        this.onerror();
+        return;
+      }
+    } else if (this.width + this.height === 0) {
+      this.onerror();
+      return;
+    }
+    handleSuccess.call(self);
+  };
+  img.onerror = function() {
+    loaded = true;
+    handleError.call(self);
+  };
+  img.src = self.url + '&c=clv1';
+}
+
+function handleSuccess(res){
+  var opts = this.requestType['options']['success'],
+      response = '';
+  xhrShim.call(this, opts);
+  if (res) {
+    try {
+      response = JSON.stringify(res);
+    } catch(e) {}
+  }
+  else {
+    response = opts['responseText'];
+  }
+  this.xhr.responseText = response;
+  this.xhr.status = opts['status'];
+  this.emit('end');
+}
+
+function handleError(){
+  var opts = this.requestType['options']['error'];
+  xhrShim.call(this, opts);
+  this.xhr.responseText = opts['responseText'];
+  this.xhr.status = opts['status'];
+  this.emit('end');
+}
+
+// custom spin on self.abort();
+function abortRequest(){
+  this.aborted = true;
+  this.clearTimeout();
+  this.emit('abort');
+}
+
+// hackety hack hack :) keep moving
+function xhrShim(opts){
+  this.xhr = {
+    getAllResponseHeaders: function(){ return ''; },
+    getResponseHeader: function(){ return 'application/json'; },
+    responseText: opts['responseText'],
+    status: opts['status']
+  };
+  return this;
+}
diff --git a/src/core/index.js b/src/core/index.js
index ca5ccb3..af2be76 100644
--- a/src/core/index.js
+++ b/src/core/index.js
@@ -1,43 +1,95 @@
-/*!
- * ----------------------
- * Keen IO Core
- * ----------------------
- */
+var root = this;
+var previous_Keen = root.Keen;
+
+var extend = require('./utils/extend');
+var Emitter = require('./helpers/emitter-shim');
 
 function Keen(config) {
   this.configure(config || {});
+  Keen.trigger('client', this);
 }
 
-Keen.version = "BUILD_VERSION"; // replaced
+Keen.debug = false;
+Keen.enabled = true;
+Keen.loaded = true;
+Keen.version = 'BUILD_VERSION'; // Overwritten @ build
 
-Keen.utils = {};
+Emitter(Keen);
+Emitter(Keen.prototype);
 
-Keen.canXHR = false;
-if (typeof XMLHttpRequest === "object" || typeof XMLHttpRequest === "function") {
-  if ("withCredentials" in new XMLHttpRequest()) {
-    Keen.canXHR = true;
+Keen.prototype.configure = function(cfg){
+  var config = cfg || {};
+  if (config['host']) {
+    config['host'].replace(/.*?:\/\//g, '');
   }
-}
+  if (config.protocol && config.protocol === 'auto') {
+    config['protocol'] = location.protocol.replace(/:/g, '');
+  }
+  this.config = {
+    projectId   : config.projectId,
+    writeKey    : config.writeKey,
+    readKey     : config.readKey,
+    masterKey   : config.masterKey,
+    requestType : config.requestType || 'jsonp',
+    host        : config['host']     || 'api.keen.io/3.0',
+    protocol    : config['protocol'] || 'https',
+    globalProperties: null
+  };
+  if (Keen.debug) {
+    this.on('error', Keen.log);
+  }
+  this.trigger('ready');
+};
 
-Keen.urlMaxLength = 16000;
-if (navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0) {
-  Keen.urlMaxLength = 2000;
-}
+Keen.prototype.projectId = function(str){
+  if (!arguments.length) return this.config.projectId;
+  this.config.projectId = (str ? String(str) : null);
+  return this;
+};
 
-Keen.enabled = true;
+Keen.prototype.masterKey = function(str){
+  if (!arguments.length) return this.config.masterKey;
+  this.config.masterKey = (str ? String(str) : null);
+  return this;
+};
 
-Keen.loaded = true;
-Keen.ready = function(callback){
-  if (Keen.loaded) {
-    callback();
-  } else {
-    Keen.on('ready', callback);
+Keen.prototype.readKey = function(str){
+  if (!arguments.length) return this.config.readKey;
+  this.config.readKey = (str ? String(str) : null);
+  return this;
+};
+
+Keen.prototype.writeKey = function(str){
+  if (!arguments.length) return this.config.writeKey;
+  this.config.writeKey = (str ? String(str) : null);
+  return this;
+};
+
+Keen.prototype.url = function(path){
+  if (!this.projectId()) {
+    this.trigger('error', 'Client is missing projectId property');
+    return;
   }
+  return this.config.protocol + '://' + this.config.host + '/projects/' + this.projectId() + path;
 };
 
-Keen.debug = false;
 Keen.log = function(message) {
-  if (Keen.debug && typeof console == "object") {
+  if (Keen.debug && typeof console == 'object') {
     console.log('[Keen IO]', message);
   }
 };
+
+Keen.noConflict = function(){
+  root.Keen = previous_Keen;
+  return Keen;
+};
+
+Keen.ready = function(fn){
+  if (Keen.loaded) {
+    fn();
+  } else {
+    Keen.once('ready', fn);
+  }
+};
+
+module.exports = Keen;
diff --git a/src/core/lib/addEvent.js b/src/core/lib/addEvent.js
index c562956..d2019a3 100644
--- a/src/core/lib/addEvent.js
+++ b/src/core/lib/addEvent.js
@@ -1,12 +1,112 @@
-// ../utils/uploadEvent.js
+var JSON2 = require('JSON2');
+var request = require('superagent');
 
-Keen.prototype.addEvent = function(eventCollection, payload, success, error) {
-  var response;
-  if (!eventCollection || typeof eventCollection !== "string") {
-    response = "Event not recorded: Collection name must be a string";
-    Keen.log(response);
-    if (error) error.call(this, response);
+var Keen = require('../index');
+
+var base64 = require('../utils/base64'),
+    each = require('../utils/each'),
+    getContext = require('../helpers/get-context'),
+    getQueryString = require('../helpers/get-query-string'),
+    getUrlMaxLength = require('../helpers/get-url-max-length'),
+    getXHR = require('../helpers/get-xhr-object'),
+    requestTypes = require('../helpers/superagent-request-types'),
+    responseHandler = require('../helpers/superagent-handle-response');
+
+module.exports = function(collection, payload, callback, async) {
+  var self = this,
+      urlBase = this.url('/events/' + collection),
+      reqType = this.config.requestType,
+      data = {},
+      cb = callback,
+      isAsync,
+      getUrl;
+
+  isAsync = ('boolean' === typeof async) ? async : true;
+
+  if (!Keen.enabled) {
+    handleValidationError.call(self, 'Keen.enabled = false');
     return;
   }
-  _uploadEvent.apply(this, arguments);
+
+  if (!self.projectId()) {
+    handleValidationError.call(self, 'Missing projectId property');
+    return;
+  }
+
+  if (!self.writeKey()) {
+    handleValidationError.call(self, 'Missing writeKey property');
+    return;
+  }
+
+  if (!collection || typeof collection !== 'string') {
+    handleValidationError.call(self, 'Collection name must be a string');
+    return;
+  }
+
+  // Attach properties from client.globalProperties
+  if (self.config.globalProperties) {
+    data = self.config.globalProperties(collection);
+  }
+  // Attach properties from user-defined event
+  each(payload, function(value, key){
+    data[key] = value;
+  });
+
+  // Override reqType if XHR not supported
+  if ( !getXHR() && 'xhr' === reqType ) {
+    reqType = 'jsonp';
+  }
+
+  // Pre-flight for GET requests
+  if ( 'xhr' !== reqType || !isAsync ) {
+    getUrl = prepareGetRequest.call(self, urlBase, data);
+  }
+
+  if ( getUrl && getContext() === 'browser' ) {
+    request
+      .get(getUrl)
+      .use(function(req){
+        req.async = isAsync;
+        return req;
+      })
+      .use(requestTypes(reqType))
+      .end(handleResponse);
+  }
+  else if ( getXHR() || getContext() === 'server' ) {
+    request
+      .post(urlBase)
+      .set('Content-Type', 'application/json')
+      .set('Authorization', self.writeKey())
+      .send(data)
+      .end(handleResponse);
+  }
+  else {
+    self.trigger('error', 'Request not sent: URL length exceeds current browser limit, and XHR (POST) is not supported.');
+  }
+
+  function handleResponse(err, res){
+    responseHandler(err, res, cb);
+    cb = callback = null;
+  }
+
+  function handleValidationError(msg){
+    var err = 'Event not recorded: ' + msg;
+    self.trigger('error', err);
+    if (cb) {
+      cb.call(self, err, null);
+      cb = callback = null;
+    }
+  }
+
+  return;
 };
+
+function prepareGetRequest(url, data){
+  // Set API key
+  url += getQueryString({
+    api_key  : this.writeKey(),
+    data     : base64.encode( JSON2.stringify(data) ),
+    modified : new Date().getTime()
+  });
+  return ( url.length < getUrlMaxLength() ) ? url : false;
+}
diff --git a/src/core/lib/addEvents.js b/src/core/lib/addEvents.js
new file mode 100644
index 0000000..3bb5081
--- /dev/null
+++ b/src/core/lib/addEvents.js
@@ -0,0 +1,89 @@
+var Keen = require('../index');
+var request = require('superagent');
+
+var each = require('../utils/each'),
+    getContext = require('../helpers/get-context'),
+    getXHR = require('../helpers/get-xhr-object'),
+    requestTypes = require('../helpers/superagent-request-types'),
+    responseHandler = require('../helpers/superagent-handle-response');
+
+module.exports = function(payload, callback) {
+  var self = this,
+      urlBase = this.url('/events'),
+      data = {},
+      cb = callback;
+
+  if (!Keen.enabled) {
+    handleValidationError.call(self, 'Keen.enabled = false');
+    return;
+  }
+
+  if (!self.projectId()) {
+    handleValidationError.call(self, 'Missing projectId property');
+    return;
+  }
+
+  if (!self.writeKey()) {
+    handleValidationError.call(self, 'Missing writeKey property');
+    return;
+  }
+
+  if (arguments.length > 2) {
+    handleValidationError.call(self, 'Incorrect arguments provided to #addEvents method');
+    return;
+  }
+
+  if (typeof payload !== 'object' || payload instanceof Array) {
+    handleValidationError.call(self, 'Request payload must be an object');
+    return;
+  }
+
+  // Attach properties from client.globalProperties
+  if (self.config.globalProperties) {
+    // Loop over each set of events
+    each(payload, function(events, collection){
+      // Loop over each individual event
+      each(events, function(body, index){
+        // Start with global properties for this collection
+        var base = self.config.globalProperties(collection);
+        // Apply provided properties for this event body
+        each(body, function(value, key){
+          base[key] = value;
+        });
+        // Create a new payload
+        data[collection].push(base);
+      });
+    });
+  }
+  else {
+    // Use existing payload
+    data = payload;
+  }
+
+  if ( getXHR() || getContext() === 'server' ) {
+    request
+      .post(urlBase)
+      .set('Content-Type', 'application/json')
+      .set('Authorization', self.writeKey())
+      .send(data)
+      .end(function(err, res){
+        responseHandler(err, res, cb);
+        cb = callback = null;
+      });
+  }
+  else {
+    // TODO: queue and fire in small, asynchronous batches
+    self.trigger('error', 'Events not recorded: XHR support is required for batch upload');
+  }
+
+  function handleValidationError(msg){
+    var err = 'Events not recorded: ' + msg;
+    self.trigger('error', err);
+    if (cb) {
+      cb.call(self, err, null);
+      cb = callback = null;
+    }
+  }
+
+  return;
+};
diff --git a/src/core/lib/configure.js b/src/core/lib/configure.js
deleted file mode 100644
index 0003210..0000000
--- a/src/core/lib/configure.js
+++ /dev/null
@@ -1,29 +0,0 @@
-Keen.prototype.configure = function(cfg){
-  var config = cfg || {};
-
-  if (!Keen.canXHR && config.requestType === "xhr") {
-    config.requestType = "jsonp";
-  }
-
-  if (config["host"]) {
-    config["host"].replace(/.*?:\/\//g, '');
-  }
-
-  if (config.protocol && config.protocol === "auto") {
-    config["protocol"] = location.protocol.replace(/:/g, '');
-  }
-
-  this.config = {
-    projectId   : config.projectId,
-    writeKey    : config.writeKey,
-    readKey     : config.readKey,
-    masterKey   : config.masterKey,
-    requestType : config.requestType || "jsonp",
-    host        : config["host"]     || "api.keen.io/3.0",
-    protocol    : config["protocol"] || "https",
-    globalProperties: null
-  };
-
-  this.trigger('ready');
-  Keen.trigger('client', this, config);
-};
diff --git a/src/core/lib/get.js b/src/core/lib/get.js
new file mode 100644
index 0000000..da1a989
--- /dev/null
+++ b/src/core/lib/get.js
@@ -0,0 +1,24 @@
+var request = require('superagent');
+var getQueryString = require('../helpers/get-query-string'),
+    handleResponse = require('../helpers/superagent-handle-response'),
+    requestTypes = require('../helpers/superagent-request-types');
+
+module.exports = function(url, params, api_key, callback){
+  var reqType = this.config.requestType,
+      data = params || {};
+
+  if (reqType === 'beacon') {
+    reqType = 'jsonp';
+  }
+
+  // Ensure api_key is present for GET requests
+  data['api_key'] = data['api_key'] || api_key;
+
+  request
+    .get(url+getQueryString(data))
+    .use(requestTypes(reqType))
+    .end(function(err, res){
+      handleResponse(err, res, callback);
+      callback = null;
+    });
+};
diff --git a/src/core/lib/masterKey.js b/src/core/lib/masterKey.js
deleted file mode 100644
index d3306f3..0000000
--- a/src/core/lib/masterKey.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Keen.prototype.masterKey = function(str){
-  if (!arguments.length) return this.config.masterKey;
-  this.config.masterKey = (str ? String(str) : null);
-  return this;
-};
diff --git a/src/core/lib/post.js b/src/core/lib/post.js
new file mode 100644
index 0000000..f913db4
--- /dev/null
+++ b/src/core/lib/post.js
@@ -0,0 +1,14 @@
+var request = require('superagent');
+var handleResponse = require('../helpers/superagent-handle-response');
+
+module.exports = function(url, data, api_key, callback){
+  request
+    .post(url)
+    .set('Content-Type', 'application/json')
+    .set('Authorization', api_key)
+    .send(data || {})
+    .end(function(err, res) {
+      handleResponse(err, res, callback);
+      callback = null;
+    });
+};
diff --git a/src/core/lib/projectId.js b/src/core/lib/projectId.js
deleted file mode 100644
index 8679ff4..0000000
--- a/src/core/lib/projectId.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Keen.prototype.projectId = function(str){
-  if (!arguments.length) return this.config.projectId;
-  this.config.projectId = (str ? String(str) : null);
-  return this;
-};
diff --git a/src/core/lib/readKey.js b/src/core/lib/readKey.js
deleted file mode 100644
index 36774c3..0000000
--- a/src/core/lib/readKey.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Keen.prototype.readKey = function(str){
-  if (!arguments.length) return this.config.readKey;
-  this.config.readKey = (str ? String(str) : null);
-  return this;
-};
diff --git a/src/core/lib/run.js b/src/core/lib/run.js
new file mode 100644
index 0000000..a874f34
--- /dev/null
+++ b/src/core/lib/run.js
@@ -0,0 +1,15 @@
+var Request = require("../request");
+module.exports = function(query, callback) {
+  var queries = [],
+      cb = callback,
+      request;
+
+  if (query instanceof Array) {
+    queries = query;
+  } else {
+    queries.push(query);
+  }
+  request = new Request(this, queries, cb).refresh();
+  cb = callback = null;
+  return request;
+};
diff --git a/src/core/lib/setGlobalProperties.js b/src/core/lib/setGlobalProperties.js
index 9437b10..dc3237f 100644
--- a/src/core/lib/setGlobalProperties.js
+++ b/src/core/lib/setGlobalProperties.js
@@ -1,7 +1,7 @@
-Keen.prototype.setGlobalProperties = function(newGlobalProperties) {
+module.exports = function(newGlobalProperties) {
   if (newGlobalProperties && typeof(newGlobalProperties) == "function") {
     this.config.globalProperties = newGlobalProperties;
   } else {
-    Keen.log('Invalid value for global properties: ' + newGlobalProperties);
+    this.trigger("error", "Invalid value for global properties: " + newGlobalProperties);
   }
 };
diff --git a/src/core/lib/trackExternalLink.js b/src/core/lib/trackExternalLink.js
index f8600c5..c1c6671 100644
--- a/src/core/lib/trackExternalLink.js
+++ b/src/core/lib/trackExternalLink.js
@@ -1,7 +1,7 @@
-// ../utils/uploadEvent.js
-
-Keen.prototype.trackExternalLink = function(jsEvent, eventCollection, payload, timeout, timeoutCallback){
+// var sendEvent = require("../utils/sendEvent");
+var addEvent = require("./addEvent");
 
+module.exports = function(jsEvent, eventCollection, payload, timeout, timeoutCallback){
   var evt = jsEvent,
       target = (evt.currentTarget) ? evt.currentTarget : (evt.srcElement || evt.target),
       timer = timeout || 500,
@@ -36,7 +36,7 @@ Keen.prototype.trackExternalLink = function(jsEvent, eventCollection, payload, t
       }
     };
   } else {
-    Keen.log("#trackExternalLink method not attached to an <a> or <form> DOM element");
+    this.trigger("error", "#trackExternalLink method not attached to an <a> or <form> DOM element");
   }
 
   if (timeoutCallback) {
@@ -47,10 +47,9 @@ Keen.prototype.trackExternalLink = function(jsEvent, eventCollection, payload, t
       }
     };
   }
-  _uploadEvent.call(this, eventCollection, payload, callback, callback);
+  addEvent.call(this, eventCollection, payload, callback);
 
   setTimeout(callback, timer);
-
   if (!evt.metaKey) {
     return false;
   }
diff --git a/src/core/lib/url.js b/src/core/lib/url.js
deleted file mode 100644
index ec92f8d..0000000
--- a/src/core/lib/url.js
+++ /dev/null
@@ -1,3 +0,0 @@
-Keen.prototype.url = function(path){
-  return this.config.protocol + "://" + this.config.host + path;
-};
diff --git a/src/core/lib/writeKey.js b/src/core/lib/writeKey.js
deleted file mode 100644
index f082abe..0000000
--- a/src/core/lib/writeKey.js
+++ /dev/null
@@ -1,5 +0,0 @@
-Keen.prototype.writeKey = function(str){
-  if (!arguments.length) return this.config.writeKey;
-  this.config.writeKey = (str ? String(str) : null);
-  return this;
-};
diff --git a/src/core/query.js b/src/core/query.js
new file mode 100644
index 0000000..db5e6a5
--- /dev/null
+++ b/src/core/query.js
@@ -0,0 +1,72 @@
+var each = require("./utils/each"),
+    extend = require("./utils/extend"),
+    getTimezoneOffset = require("./helpers/get-timezone-offset"),
+    getQueryString = require("./helpers/get-query-string");
+
+var Emitter = require('./helpers/emitter-shim');
+
+function Query(){
+  this.configure.apply(this, arguments);
+};
+Emitter(Query.prototype);
+
+Query.prototype.configure = function(analysisType, params) {
+  this.analysis = analysisType;
+
+  // Apply params w/ #set method
+  this.params = this.params || {};
+  this.set(params);
+
+  // Localize timezone if none is set
+  if (this.params.timezone === void 0) {
+    this.params.timezone = getTimezoneOffset();
+  }
+  return this;
+};
+
+Query.prototype.set = function(attributes) {
+  var self = this;
+  each(attributes, function(v, k){
+    var key = k, value = v;
+    if (k.match(new RegExp("[A-Z]"))) {
+      key = k.replace(/([A-Z])/g, function($1) { return "_"+$1.toLowerCase(); });
+    }
+    self.params[key] = value;
+    if (value instanceof Array) {
+      each(value, function(dv, index){
+        if (dv instanceof Array == false && typeof dv === "object") { //  _type(dv)==="Object"
+          each(dv, function(deepValue, deepKey){
+            if (deepKey.match(new RegExp("[A-Z]"))) {
+              var _deepKey = deepKey.replace(/([A-Z])/g, function($1) { return "_"+$1.toLowerCase(); });
+              delete self.params[key][index][deepKey];
+              self.params[key][index][_deepKey] = deepValue;
+            }
+          });
+        }
+      });
+    }
+  });
+  return self;
+};
+
+Query.prototype.get = function(attribute) {
+  var key = attribute;
+  if (key.match(new RegExp("[A-Z]"))) {
+    key = key.replace(/([A-Z])/g, function($1) { return "_"+$1.toLowerCase(); });
+  }
+  if (this.params) {
+    return this.params[key] || null;
+  }
+};
+
+Query.prototype.addFilter = function(property, operator, value) {
+  this.params.filters = this.params.filters || [];
+  this.params.filters.push({
+    "property_name": property,
+    "operator": operator,
+    "property_value": value
+  });
+  return this;
+};
+
+module.exports = Query;
diff --git a/src/core/request.js b/src/core/request.js
new file mode 100644
index 0000000..157606a
--- /dev/null
+++ b/src/core/request.js
@@ -0,0 +1,90 @@
+var each = require("./utils/each"),
+    extend = require("./utils/extend"),
+    sendQuery = require("./utils/sendQuery");
+
+var Keen = require("./");
+var Emitter = require('./helpers/emitter-shim');
+
+function Request(client, queries, callback){
+  var cb = callback;
+  this.config = {
+    timeout: 300 * 1000
+  };
+  this.configure(client, queries, cb);
+  cb = callback = null;
+};
+Emitter(Request.prototype);
+
+Request.prototype.configure = function(client, queries, callback){
+  var cb = callback;
+  extend(this, {
+    "client"   : client,
+    "queries"  : queries,
+    "data"     : {},
+    "callback" : cb
+  });
+  cb = callback = null;
+  return this;
+};
+
+Request.prototype.timeout = function(ms){
+  if (!arguments.length) return this.config.timeout;
+  this.config.timeout = (!isNaN(parseInt(ms)) ? parseInt(ms) : null);
+  return this;
+};
+
+Request.prototype.refresh = function(){
+  var self = this,
+      completions = 0,
+      response = [],
+      errored = false;
+
+  var handleResponse = function(err, res, index){
+    if (err) {
+      self.trigger("error", err);
+      if (self.callback) {
+        self.callback(err, null);
+      }
+      errored = true;
+      return;
+    }
+    response[index] = res;
+    completions++;
+    if (completions == self.queries.length && !errored) {
+      self.data = (self.queries.length == 1) ? response[0] : response;
+      self.trigger("complete", null, self.data);
+      if (self.callback) {
+        self.callback(null, self.data);
+      }
+    }
+  };
+
+  each(self.queries, function(query, index){
+    var path;
+    var cbSequencer = function(err, res){
+      handleResponse(err, res, index);
+    };
+
+    if (query instanceof Keen.Query) {
+      path = "/queries/" + query.analysis;
+      sendQuery.call(self, path, query.params, cbSequencer);
+    }
+    else if ( Object.prototype.toString.call(query) === "[object String]" ) {
+      path = "/saved_queries/" + encodeURIComponent(query) + "/result";
+      sendQuery.call(self, path, null, cbSequencer);
+    }
+    else {
+      var res = {
+        statusText: "Bad Request",
+        responseText: { message: "Error: Query " + (+index+1) + " of " + self.queries.length + " for project " + self.client.projectId() + " is not a valid request" }
+      };
+      self.trigger("error", res.responseText.message);
+      if (self.callback) {
+        self.callback(res.responseText.message, null);
+      }
+    }
+  });
+  return this;
+};
+
+module.exports = Request;
diff --git a/src/core/utils/base64.js b/src/core/utils/base64.js
new file mode 100644
index 0000000..1b7d7fb
--- /dev/null
+++ b/src/core/utils/base64.js
@@ -0,0 +1,46 @@
+module.exports = {
+  map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+  encode: function (n) {
+    "use strict";
+    var o = "", i = 0, m = this.map, i1, i2, i3, e1, e2, e3, e4;
+    n = this.utf8.encode(n);
+    while (i < n.length) {
+      i1 = n.charCodeAt(i++); i2 = n.charCodeAt(i++); i3 = n.charCodeAt(i++);
+      e1 = (i1 >> 2); e2 = (((i1 & 3) << 4) | (i2 >> 4)); e3 = (isNaN(i2) ? 64 : ((i2 & 15) << 2) | (i3 >> 6));
+      e4 = (isNaN(i2) || isNaN(i3)) ? 64 : i3 & 63;
+      o = o + m.charAt(e1) + m.charAt(e2) + m.charAt(e3) + m.charAt(e4);
+    } return o;
+  },
+  decode: function (n) {
+    "use strict";
+    var o = "", i = 0, m = this.map, cc = String.fromCharCode, e1, e2, e3, e4, c1, c2, c3;
+    n = n.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+    while (i < n.length) {
+      e1 = m.indexOf(n.charAt(i++)); e2 = m.indexOf(n.charAt(i++));
+      e3 = m.indexOf(n.charAt(i++)); e4 = m.indexOf(n.charAt(i++));
+      c1 = (e1 << 2) | (e2 >> 4); c2 = ((e2 & 15) << 4) | (e3 >> 2);
+      c3 = ((e3 & 3) << 6) | e4;
+      o = o + (cc(c1) + ((e3 != 64) ? cc(c2) : "")) + (((e4 != 64) ? cc(c3) : ""));
+    } return this.utf8.decode(o);
+  },
+  utf8: {
+    encode: function (n) {
+      "use strict";
+      var o = "", i = 0, cc = String.fromCharCode, c;
+      while (i < n.length) {
+        c = n.charCodeAt(i++); o = o + ((c < 128) ? cc(c) : ((c > 127) && (c < 2048)) ?
+        (cc((c >> 6) | 192) + cc((c & 63) | 128)) : (cc((c >> 12) | 224) + cc(((c >> 6) & 63) | 128) + cc((c & 63) | 128)));
+        } return o;
+    },
+    decode: function (n) {
+      "use strict";
+      var o = "", i = 0, cc = String.fromCharCode, c2, c;
+      while (i < n.length) {
+        c = n.charCodeAt(i);
+        o = o + ((c < 128) ? [cc(c), i++][0] : ((c > 191) && (c < 224)) ?
+        [cc(((c & 31) << 6) | ((c2 = n.charCodeAt(i + 1)) & 63)), (i += 2)][0] :
+        [cc(((c & 15) << 12) | (((c2 = n.charCodeAt(i + 1)) & 63) << 6) | ((c3 = n.charCodeAt(i + 2)) & 63)), (i += 3)][0]);
+      } return o;
+    }
+  }
+};
diff --git a/src/core/utils/clone.js b/src/core/utils/clone.js
index 2342b39..359a796 100644
--- a/src/core/utils/clone.js
+++ b/src/core/utils/clone.js
@@ -1,3 +1,5 @@
-function _clone(target) {
-  return JSON.parse(JSON.stringify(target));
-}
\ No newline at end of file
+var JSON2 = require("JSON2");
+
+module.exports = function(target) {
+  return JSON2.parse( JSON2.stringify( target ) );
+};
diff --git a/src/core/utils/each.js b/src/core/utils/each.js
index aa9910c..71bae20 100644
--- a/src/core/utils/each.js
+++ b/src/core/utils/each.js
@@ -1,4 +1,4 @@
-function _each(o, cb, s){
+module.exports = function(o, cb, s){
   var n;
   if (!o){
     return 0;
@@ -22,5 +22,4 @@ function _each(o, cb, s){
     }
   }
   return 1;
-}
-_extend(Keen.utils, { each: _each });
+};
diff --git a/src/core/utils/extend.js b/src/core/utils/extend.js
index 58c4c8c..4e9d4fa 100644
--- a/src/core/utils/extend.js
+++ b/src/core/utils/extend.js
@@ -1,9 +1,8 @@
-function _extend(target){
+module.exports = function(target){
   for (var i = 1; i < arguments.length; i++) {
     for (var prop in arguments[i]){
       target[prop] = arguments[i][prop];
     }
   }
   return target;
-}
-_extend(Keen.utils, { extend: _extend });
+};
diff --git a/src/core/utils/parseParams.js b/src/core/utils/parseParams.js
index 186166b..f578354 100644
--- a/src/core/utils/parseParams.js
+++ b/src/core/utils/parseParams.js
@@ -1,4 +1,4 @@
-function _parseParams(str){
+function parseParams(str){
   // via: http://stackoverflow.com/a/2880929/2511985
   var urlParams = {},
       match,
@@ -11,5 +11,6 @@ function _parseParams(str){
     urlParams[decode(match[1])] = decode(match[2]);
   }
   return urlParams;
-}
-_extend(Keen.utils, { parseParams: _parseParams });
+};
+
+module.exports = parseParams;
diff --git a/src/core/utils/sendBeacon.js b/src/core/utils/sendBeacon.js
deleted file mode 100644
index 8a6fb04..0000000
--- a/src/core/utils/sendBeacon.js
+++ /dev/null
@@ -1,34 +0,0 @@
-function _sendBeacon(url, params, success, error){
-  var successCallback = success,
-      errorCallback = error,
-      loaded = false,
-      img = document.createElement("img");
-
-  success = null;
-  error = null;
-
-  img.onload = function() {
-    loaded = true;
-    if ('naturalHeight' in this) {
-      if (this.naturalHeight + this.naturalWidth === 0) {
-        this.onerror();
-        return;
-      }
-    } else if (this.width + this.height === 0) {
-      this.onerror();
-      return;
-    }
-    if (successCallback) {
-      successCallback({created: true});
-      successCallback = errorCallback = null;
-    }
-  };
-  img.onerror = function() {
-    loaded = true;
-    if (errorCallback) {
-      errorCallback();
-      successCallback = errorCallback = null;
-    }
-  };
-  img.src = url + "&c=clv1";
-}
diff --git a/src/core/utils/sendJsonp.js b/src/core/utils/sendJsonp.js
deleted file mode 100644
index 77977a2..0000000
--- a/src/core/utils/sendJsonp.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function _sendJsonp(url, params, success, error){
-  var timestamp = new Date().getTime(),
-      successCallback = success,
-      errorCallback = error,
-      script = document.createElement("script"),
-      parent = document.getElementsByTagName("head")[0],
-      callbackName = "keenJSONPCallback",
-      loaded = false;
-
-  success = null;
-  error = null;
-
-  callbackName += timestamp;
-  while (callbackName in window) {
-    callbackName += "a";
-  }
-  window[callbackName] = function(response) {
-    if (loaded === true) return;
-    loaded = true;
-    if (successCallback && response) {
-      successCallback(response);
-    };
-    cleanup();
-  };
-
-  script.src = url + "&jsonp=" + callbackName;
-  parent.appendChild(script);
-
-  // for early IE w/ no onerror event
-  script.onreadystatechange = function() {
-    if (loaded === false && this.readyState === "loaded") {
-      loaded = true;
-      if (errorCallback) {
-        errorCallback();
-      }
-    }
-  };
-
-  // non-ie, etc
-  script.onerror = function() {
-    // on IE9 both onerror and onreadystatechange are called
-    if (loaded === false) {
-      loaded = true;
-      if (errorCallback) {
-        errorCallback();
-      }
-      cleanup();
-    }
-  };
-
-  function cleanup(){
-    window[callbackName] = undefined;
-    try{
-      delete window[callbackName];
-    }catch(e){}
-    successCallback = errorCallback = null;
-    parent.removeChild(script);
-  }
-}
diff --git a/src/core/utils/sendQuery.js b/src/core/utils/sendQuery.js
new file mode 100644
index 0000000..cb5c56b
--- /dev/null
+++ b/src/core/utils/sendQuery.js
@@ -0,0 +1,58 @@
+var request = require('superagent');
+
+var getContext = require('../helpers/get-context'),
+    getQueryString = require('../helpers/get-query-string'),
+    getUrlMaxLength = require('../helpers/get-url-max-length'),
+    getXHR = require('../helpers/get-xhr-object'),
+    requestTypes = require('../helpers/superagent-request-types'),
+    responseHandler = require('../helpers/superagent-handle-response');
+
+module.exports = function(path, params, callback){
+  var self = this,
+      urlBase = this.client.url(path),
+      reqType = this.client.config.requestType,
+      cb = callback;
+
+  callback = null;
+
+  if (!self.client.projectId()) {
+    self.client.trigger('error', 'Query not sent: Missing projectId property');
+    return;
+  }
+
+  if (!self.client.readKey()) {
+    self.client.trigger('error', 'Query not sent: Missing readKey property');
+    return;
+  }
+
+  if (getXHR() || getContext() === 'server' ) {
+    request
+      .post(urlBase)
+        .set('Content-Type', 'application/json')
+        .set('Authorization', self.client.readKey())
+        .timeout(self.timeout())
+        .send(params || {})
+        .end(handleResponse);
+  }
+  else {
+    extend(params, { api_key: self.client.readKey() });
+    urlBase += getQueryString(params);
+    if (urlBase.length < getUrlMaxLength() ) {
+      request
+        .get(urlBase)
+        .timeout(self.timeout())
+        .use(requestTypes('jsonp'))
+        .end(handleResponse);
+    }
+    else {
+      self.client.trigger('error', 'Query not sent: URL length exceeds current browser limit, and XHR (POST) is not supported.');
+    }
+  }
+
+  function handleResponse(err, res){
+    responseHandler(err, res, cb);
+    cb = callback = null;
+  }
+
+  return;
+}
diff --git a/src/core/utils/sendXhr.js b/src/core/utils/sendXhr.js
deleted file mode 100644
index d9e2115..0000000
--- a/src/core/utils/sendXhr.js
+++ /dev/null
@@ -1,67 +0,0 @@
-function _sendXhr(method, url, headers, body, success, error){
-  var ids = ['MSXML2.XMLHTTP.3.0', 'MSXML2.XMLHTTP', 'Microsoft.XMLHTTP'],
-      successCallback = success,
-      errorCallback = error,
-      payload,
-      xhr;
-
-  success = null;
-  error = null;
-
-  if (window.XMLHttpRequest) {
-    xhr = new XMLHttpRequest();
-  }
-  else {
-    // Legacy IE support: look up alts if XMLHttpRequest is not available
-    for (var i = 0; i < ids.length; i++) {
-      try {
-        xhr = new ActiveXObject(ids[i]);
-        break;
-      } catch(e) {}
-    }
-  }
-
-  xhr.onreadystatechange = function() {
-    var response;
-    if (xhr.readyState == 4) {
-      if (xhr.status >= 200 && xhr.status < 300) {
-        try {
-          response = JSON.parse(xhr.responseText);
-        } catch (e) {
-          Keen.log("Could not parse HTTP response: " + xhr.responseText);
-          if (errorCallback) {
-            errorCallback(xhr, e);
-            successCallback = errorCallback = null;
-          }
-        }
-        if (successCallback && response) {
-          successCallback(response);
-          successCallback = errorCallback = null;
-        }
-      } else {
-        Keen.log("HTTP request failed.");
-        if (errorCallback) {
-          errorCallback(xhr, null);
-          successCallback = errorCallback = null;
-        }
-      }
-    }
-  };
-
-  xhr.open(method, url, true);
-
-  _each(headers, function(value, key){
-    xhr.setRequestHeader(key, value);
-  });
-
-  if (body) {
-    payload = JSON.stringify(body);
-  }
-
-  if (method && method.toUpperCase() === "GET") {
-    xhr.send();
-  } else if (method && method.toUpperCase() === "POST") {
-    xhr.send(payload);
-  }
-
-}
diff --git a/src/core/utils/uploadEvent.js b/src/core/utils/uploadEvent.js
deleted file mode 100644
index ed42a24..0000000
--- a/src/core/utils/uploadEvent.js
+++ /dev/null
@@ -1,54 +0,0 @@
-function _uploadEvent(eventCollection, payload, success, error) {
-  var urlBase, urlQueryString, reqType, data;
-
-  if (!Keen.enabled) {
-    Keen.log("Event not recorded: Keen.enabled = false");
-    return;
-  }
-
-  if (!this.projectId()) {
-    Keen.log("Event not recorded: Missing projectId property");
-    return;
-  }
-
-  if (!this.writeKey()) {
-    Keen.log("Event not recorded: Missing writeKey property");
-    return;
-  }
-
-  urlBase = this.url("/projects/" + this.projectId() + "/events/" + eventCollection);
-  urlQueryString = "";
-  reqType = this.config.requestType;
-  data = {};
-
-  // Add properties from client.globalProperties
-  if (this.config.globalProperties) {
-    data = this.config.globalProperties(eventCollection);
-  }
-
-  // Add properties from user-defined event
-  _each(payload, function(value, key){
-    data[key] = value;
-  });
-
-  if (reqType !== "xhr") {
-    urlQueryString += "?api_key="  + encodeURIComponent( this.writeKey() );
-    urlQueryString += "&data="     + encodeURIComponent( Keen.Base64.encode( JSON.stringify(data) ) );
-    urlQueryString += "&modified=" + encodeURIComponent( new Date().getTime() );
-
-    if ( String(urlBase + urlQueryString).length < Keen.urlMaxLength ) {
-      if (reqType === "jsonp") {
-        _sendJsonp(urlBase + urlQueryString, null, success, error);
-      } else {
-        _sendBeacon(urlBase + urlQueryString, null, success, error);
-      }
-      return;
-    }
-  }
-  if (Keen.canXHR) {
-    _sendXhr("POST", urlBase, { "Authorization": this.writeKey(), "Content-Type": "application/json" }, data, success, error);
-  } else {
-    Keen.log("Event not sent: URL length exceeds current browser limit, and XHR (POST) is not supported.");
-  }
-  return;
-};
diff --git a/src/dataset/dataset.js b/src/dataset/dataset.js
new file mode 100644
index 0000000..b6503b1
--- /dev/null
+++ b/src/dataset/dataset.js
@@ -0,0 +1,332 @@
+var clone = require("../core/utils/clone"),
+    each = require("../core/utils/each"),
+    flatten = require("./utils/flatten"),
+    parse = require("./utils/parse");
+
+var Emitter = require('../core/helpers/emitter-shim');
+
+function Dataset(){
+  this.data = {
+    input: {},
+    output: [[]]
+  };
+  this.meta = {
+    schema: {},
+    method: undefined
+  };
+  // temp fwd
+  if (arguments.length > 0) {
+    this.parse.apply(this, arguments);
+  }
+}
+
+Dataset.defaults = {
+  delimeter: " -> "
+};
+
+Emitter(Dataset);
+Emitter(Dataset.prototype);
+
+Dataset.prototype.input = function(obj){
+  if (!arguments.length) return this["data"]["input"];
+  this["data"]["input"] = (obj ? clone(obj) : null);
+  return this;
+};
+
+Dataset.prototype.output = function(arr){
+  if (!arguments.length) return this["data"].output;
+  this["data"].output = (arr instanceof Array ? arr : null);
+  return this;
+}
+
+Dataset.prototype.method = function(str){
+  if (!arguments.length) return this.meta["method"];
+  this.meta["method"] = (str ? String(str) : null);
+  return this;
+};
+
+Dataset.prototype.schema = function(obj){
+  if (!arguments.length) return this.meta.schema;
+  this.meta.schema = (obj ? obj : null);
+  return this;
+};
+
+Dataset.prototype.parse = function(raw, schema){
+  var options;
+  if (raw) this.input(raw);
+  if (schema) this.schema(schema);
+
+  // Reset output value
+  this.output([[]]);
+
+  if (this.meta.schema.select) {
+    this.method("select");
+    options = extend({
+      records: "",
+      select: true
+    }, this.schema());
+    _select.call(this, _optHash(options));
+  }
+  else if (this.meta.schema.unpack) {
+    this.method("unpack");
+    options = extend({
+      records: "",
+      unpack: {
+        index: false,
+        value: false,
+        label: false
+      }
+    }, this.schema());
+    _unpack.call(this, _optHash(options));
+  }
+  return this;
+};
+
+
+// Select
+// --------------------------------------
+
+function _select(cfg){
+
+  var self = this,
+      options = cfg || {},
+      target_set = [],
+      unique_keys = [];
+
+  var root, records_target;
+  if (options.records === "" || !options.records) {
+    root = [self.input()];
+  } else {
+    records_target = options.records.split(Dataset.defaults.delimeter);
+    root = parse.apply(self, [self.input()].concat(records_target))[0];
+  }
+
+  each(options.select, function(prop){
+    target_set.push(prop.path.split(Dataset.defaults.delimeter));
+  });
+
+  // Retrieve keys found in asymmetrical collections
+  if (target_set.length == 0) {
+    each(root, function(record, interval){
+      var flat = flatten(record);
+      //console.log('flat', flat);
+      for (var key in flat) {
+        if (flat.hasOwnProperty(key) && unique_keys.indexOf(key) == -1) {
+          unique_keys.push(key);
+          target_set.push([key]);
+        }
+      }
+    });
+  }
+
+  var test = [[]];
+
+  // Append header row
+  each(target_set, function(props, i){
+    if (target_set.length == 1) {
+      // Static header for single value
+      test[0].push('label', 'value');
+    } else {
+      // Dynamic header for n-values
+      test[0].push(props.join("."));
+    }
+  });
+
+  // Append all rows
+  each(root, function(record, i){
+    var flat = flatten(record);
+    if (target_set.length == 1) {
+      // Static row for single value
+      test.push([target_set.join("."), flat[target_set.join(".")]]);
+    } else {
+      // Dynamic row for n-values
+      test.push([]);
+      each(target_set, function(t, j){
+        var target = t.join(".");
+        test[i+1].push(flat[target]);
+      });
+    }
+  });
+
+  self.output(test);
+  self.format(options.select);
+  return self;
+}
+
+
+// Unpack
+// --------------------------------------
+
+function _unpack(options){
+  //console.log('Unpacking', options);
+  var self = this, discovered_labels = [];
+
+  var value_set = (options.unpack.value) ? options.unpack.value.path.split(Dataset.defaults.delimeter) : false,
+      label_set = (options.unpack.label) ? options.unpack.label.path.split(Dataset.defaults.delimeter) : false,
+      index_set = (options.unpack.index) ? options.unpack.index.path.split(Dataset.defaults.delimeter) : false;
+  //console.log(index_set, label_set, value_set);
+
+  var value_desc = (value_set[value_set.length-1] !== "") ? value_set[value_set.length-1] : "Value",
+      label_desc = (label_set[label_set.length-1] !== "") ? label_set[label_set.length-1] : "Label",
+      index_desc = (index_set[index_set.length-1] !== "") ? index_set[index_set.length-1] : "Index";
+
+  // Prepare root for parsing
+  var root = (function(){
+    var root;
+    if (options.records == "") {
+      root = [self.input()];
+    } else {
+      root = parse.apply(self, [self.input()].concat(options.records.split(Dataset.defaults.delimeter)));
+    }
+    return root[0];
+  })();
+
+  if (root instanceof Array == false) {
+    root = [root];
+  }
+
+  // Find labels
+  each(root, function(record, interval){
+    var labels = (label_set) ? parse.apply(self, [record].concat(label_set)) : [];
+    if (labels) {
+      discovered_labels = labels;
+    }
+  });
+
+  // Parse each record
+  each(root, function(record, interval){
+    //console.log('record', record);
+
+    var plucked_value = (value_set) ? parse.apply(self, [record].concat(value_set)) : false,
+        //plucked_label = (label_set) ? parse.apply(self, [record].concat(label_set)) : false,
+        plucked_index = (index_set) ? parse.apply(self, [record].concat(index_set)) : false;
+    //console.log(plucked_index, plucked_label, plucked_value);
+
+    // Inject row for each index
+    if (plucked_index) {
+      each(plucked_index, function(){
+        self.data.output.push([]);
+      });
+    } else {
+      self.data.output.push([]);
+    }
+
+    // Build index column
+    if (plucked_index) {
+
+      // Build index/label on first interval
+      if (interval == 0) {
+
+        // Push last index property to 0,0
+        self.data.output[0].push(index_desc);
+
+        // Build subsequent series headers (1:N)
+        if (discovered_labels.length > 0) {
+          each(discovered_labels, function(value, i){
+            self.data.output[0].push(value);
+          });
+
+        } else {
+          self.data.output[0].push(value_desc);
+        }
+      }
+
+      // Correct for odd root cases
+      if (root.length < self.data.output.length-1) {
+        if (interval == 0) {
+          each(self.data.output, function(row, i){
+            if (i > 0) {
+              self.data.output[i].push(plucked_index[i-1]);
+            }
+          });
+        }
+      } else {
+        self.data.output[interval+1].push(plucked_index[0]);
+      }
+    }
+
+    // Build label column
+    if (!plucked_index && discovered_labels.length > 0) {
+      if (interval == 0) {
+        self.data.output[0].push(label_desc);
+        self.data.output[0].push(value_desc);
+      }
+      self.data.output[interval+1].push(discovered_labels[0]);
+    }
+
+    if (!plucked_index && discovered_labels.length == 0) {
+      // [REVISIT]
+      self.data.output[0].push('');
+    }
+
+    // Append values
+    if (plucked_value) {
+      // Correct for odd root cases
+      if (root.length < self.data.output.length-1) {
+        if (interval == 0) {
+          each(self.data.output, function(row, i){
+            if (i > 0) {
+              self.data.output[i].push(plucked_value[i-1]);
+            }
+          });
+        }
+      } else {
+        each(plucked_value, function(value){
+          self.data.output[interval+1].push(value);
+        });
+      }
+    } else {
+      // append null across this row
+      each(self.data.output[0], function(cell, i){
+        var offset = (plucked_index) ? 0 : -1;
+        if (i > offset) {
+          self.data.output[interval+1].push(null);
+        }
+      })
+    }
+
+  });
+
+  self.format(options.unpack);
+  //self.sort(options.sort);
+  return this;
+}
+
+
+
+// String configs to hash paths
+// --------------------------------------
+
+function _optHash(options){
+  each(options.unpack, function(value, key, object){
+    if (value && is(value, 'string')) {
+      options.unpack[key] = { path: options.unpack[key] };
+    }
+  });
+  return options;
+}
+
+
+// via: https://github.com/spocke/punymce
+function is(o, t){
+  o = typeof(o);
+  if (!t){
+    return o != 'undefined';
+  }
+  return o == t;
+}
+
+// Adapted to exclude null values
+function extend(o, e){
+  each(e, function(v, n){
+    if (is(o[n], 'object') && is(v, 'object')){
+      o[n] = extend(o[n], v);
+    } else if (v !== null) {
+      o[n] = v;
+    }
+  });
+  return o;
+}
+
+module.exports = Dataset;
+return;
diff --git a/src/dataset/index.js b/src/dataset/index.js
index 1e46b2b..2a704ac 100644
--- a/src/dataset/index.js
+++ b/src/dataset/index.js
@@ -1,470 +1,17 @@
-/*!
- * ----------------------
- * Keen.Dataset
- * ----------------------
- */
-
-// extend(Keen.Dataset, {
-//   each: each,
-//   extend: extend,
-//   is: is,
-//   flatten: flatten
-// });
-
-Keen.Dataset = function() {
-  this.data = {
-    input: {},
-    output: [[]]
-  };
-  this.meta = {
-    schema: {},
-    method: undefined
-  };
-  // temp fwd
-  if (arguments.length > 0) {
-    this.parse.apply(this, arguments);
-  }
-};
-
-Keen.Dataset.defaults = {
-  delimeter: " -> "
-};
-
-Keen.Dataset.prototype.input = function(obj){
-  if (!arguments.length) return this.data.input;
-  this.data.input = (obj ? JSON.parse(JSON.stringify(obj)) : null);
-  return this;
-};
-
-Keen.Dataset.prototype.output = function(arr){
-  if (!arguments.length) return this.data.output;
-  this.data.output = (arr instanceof Array ? arr : null);
-  return this;
-}
-
-Keen.Dataset.prototype.method = function(str){
-  if (!arguments.length) return this.meta.method;
-  this.meta.method = (str ? String(str) : null);
-  return this;
-};
-
-Keen.Dataset.prototype.schema = function(obj){
-  if (!arguments.length) return this.meta.schema;
-  this.meta.schema = (obj ? obj : null);
-  return this;
-};
-
-Keen.Dataset.prototype.parse = function(raw, schema){
-  var options;
-  if (raw) this.input(raw);
-  if (schema) this.schema(schema);
-
-  // Reset output value
-  this.output([[]]);
-
-  if (this.meta.schema.select) {
-    this.method("select");
-    options = extend({
-      records: "",
-      select: true
-    }, this.schema());
-    _select.call(this, _optHash(options));
-  }
-  else if (this.meta.schema.unpack) {
-    this.method("unpack");
-    options = extend({
-      records: "",
-      unpack: {
-        index: false,
-        value: false,
-        label: false
-      }
-    }, this.schema());
-    _unpack.call(this, _optHash(options));
-  }
-  return this;
-};
-
-
-// Select
-// --------------------------------------
-
-function _select(cfg){
-
-  var self = this,
-      options = cfg || {},
-      target_set = [],
-      unique_keys = [];
-
-  var root, records_target;
-  if (options.records === "" || !options.records) {
-    root = [self.input()];
-  } else {
-    records_target = options.records.split(Keen.Dataset.defaults.delimeter);
-    root = parse.apply(self, [self.input()].concat(records_target))[0];
-  }
-
-  each(options.select, function(prop){
-    target_set.push(prop.path.split(Keen.Dataset.defaults.delimeter));
-  });
-
-  // Retrieve keys found in asymmetrical collections
-  if (target_set.length == 0) {
-    each(root, function(record, interval){
-      var flat = flatten(record);
-      //console.log('flat', flat);
-      for (var key in flat) {
-        if (flat.hasOwnProperty(key) && unique_keys.indexOf(key) == -1) {
-          unique_keys.push(key);
-          target_set.push([key]);
-        }
-      }
-    });
-  }
-
-  var test = [[]];
-
-  // Append header row
-  each(target_set, function(props, i){
-    if (target_set.length == 1) {
-      // Static header for single value
-      test[0].push('label', 'value');
-    } else {
-      // Dynamic header for n-values
-      test[0].push(props.join("."));
-    }
-  });
-
-  // Append all rows
-  each(root, function(record, i){
-    var flat = flatten(record);
-    if (target_set.length == 1) {
-      // Static row for single value
-      test.push([target_set.join("."), flat[target_set.join(".")]]);
-    } else {
-      // Dynamic row for n-values
-      test.push([]);
-      each(target_set, function(t, j){
-        var target = t.join(".");
-        test[i+1].push(flat[target]);
-      });
-    }
-  });
-
-  self.output(test);
-  self.format(options.select);
-  return self;
-}
-
-
-// Unpack
-// --------------------------------------
-
-function _unpack(options){
-  //console.log('Unpacking', options);
-  var self = this, discovered_labels = [];
-
-  var value_set = (options.unpack.value) ? options.unpack.value.path.split(Keen.Dataset.defaults.delimeter) : false,
-      label_set = (options.unpack.label) ? options.unpack.label.path.split(Keen.Dataset.defaults.delimeter) : false,
-      index_set = (options.unpack.index) ? options.unpack.index.path.split(Keen.Dataset.defaults.delimeter) : false;
-  //console.log(index_set, label_set, value_set);
-
-  var value_desc = (value_set[value_set.length-1] !== "") ? value_set[value_set.length-1] : "Value",
-      label_desc = (label_set[label_set.length-1] !== "") ? label_set[label_set.length-1] : "Label",
-      index_desc = (index_set[index_set.length-1] !== "") ? index_set[index_set.length-1] : "Index";
-
-  // Prepare root for parsing
-  var root = (function(){
-    var root;
-    if (options.records == "") {
-      root = [self.input()];
-    } else {
-      root = parse.apply(self, [self.input()].concat(options.records.split(Keen.Dataset.defaults.delimeter)));
-    }
-    return root[0];
-  })();
-
-  if (root instanceof Array == false) {
-    root = [root];
-  }
-
-  // Find labels
-  each(root, function(record, interval){
-    var labels = (label_set) ? parse.apply(self, [record].concat(label_set)) : [];
-    if (labels) {
-      discovered_labels = labels;
-    }
-  });
-
-  // Parse each record
-  each(root, function(record, interval){
-    //console.log('record', record);
-
-    var plucked_value = (value_set) ? parse.apply(self, [record].concat(value_set)) : false,
-        //plucked_label = (label_set) ? parse.apply(self, [record].concat(label_set)) : false,
-        plucked_index = (index_set) ? parse.apply(self, [record].concat(index_set)) : false;
-    //console.log(plucked_index, plucked_label, plucked_value);
-
-    // Inject row for each index
-    if (plucked_index) {
-      each(plucked_index, function(){
-        self.data.output.push([]);
-      });
-    } else {
-      self.data.output.push([]);
-    }
-
-    // Build index column
-    if (plucked_index) {
-
-      // Build index/label on first interval
-      if (interval == 0) {
-
-        // Push last index property to 0,0
-        self.data.output[0].push(index_desc);
-
-        // Build subsequent series headers (1:N)
-        if (discovered_labels.length > 0) {
-          each(discovered_labels, function(value, i){
-            self.data.output[0].push(value);
-          });
-
-        } else {
-          self.data.output[0].push(value_desc);
-        }
-      }
-
-      // Correct for odd root cases
-      if (root.length < self.data.output.length-1) {
-        if (interval == 0) {
-          each(self.data.output, function(row, i){
-            if (i > 0) {
-              self.data.output[i].push(plucked_index[i-1]);
-            }
-          });
-        }
-      } else {
-        self.data.output[interval+1].push(plucked_index[0]);
-      }
-    }
-
-    // Build label column
-    if (!plucked_index && discovered_labels.length > 0) {
-      if (interval == 0) {
-        self.data.output[0].push(label_desc);
-        self.data.output[0].push(value_desc);
-      }
-      self.data.output[interval+1].push(discovered_labels[0]);
-    }
-
-    if (!plucked_index && discovered_labels.length == 0) {
-      // [REVISIT]
-      self.data.output[0].push('');
-    }
-
-    // Append values
-    if (plucked_value) {
-      // Correct for odd root cases
-      if (root.length < self.data.output.length-1) {
-        if (interval == 0) {
-          each(self.data.output, function(row, i){
-            if (i > 0) {
-              self.data.output[i].push(plucked_value[i-1]);
-            }
-          });
-        }
-      } else {
-        each(plucked_value, function(value){
-          self.data.output[interval+1].push(value);
-        });
-      }
-    } else {
-      // append null across this row
-      each(self.data.output[0], function(cell, i){
-        var offset = (plucked_index) ? 0 : -1;
-        if (i > offset) {
-          self.data.output[interval+1].push(null);
-        }
-      })
-    }
-
-  });
-
-  self.format(options.unpack);
-  //self.sort(options.sort);
-  return this;
-}
-
-
-
-// String configs to hash paths
-// --------------------------------------
-
-function _optHash(options){
-  each(options.unpack, function(value, key, object){
-    if (value && is(value, 'string')) {
-      options.unpack[key] = { path: options.unpack[key] };
-    }
-  });
-  return options;
-}
-
-
-
-// ♫♩♬ Holy Diver! ♬♩♫
-// --------------------------------------
-
-function parse() {
-  var result = [];
-  var loop = function() {
-    var root = arguments[0];
-    var args = Array.prototype.slice.call(arguments, 1);
-    var target = args.pop();
-
-    if (args.length === 0) {
-      if (root instanceof Array) {
-        args = root;
-      } else if (typeof root === 'object') {
-        args.push(root);
-      }
-    }
-
-    each(args, function(el){
-
-      // Grab the numbers and nulls
-      if (target == "") {
-        if (typeof el == "number" || el == null) {
-          return result.push(el);
-        }
-      }
-
-      if (el[target] || el[target] === 0 || el[target] !== void 0) {
-        // Easy grab!
-        if (el[target] === null) {
-          return result.push(null);
-        } else {
-          return result.push(el[target]);
-        }
-
-      } else if (root[el]){
-        if (root[el] instanceof Array) {
-          // dive through each array item
-
-          each(root[el], function(n, i) {
-            var splinter = [root[el]].concat(root[el][i]).concat(args.slice(1)).concat(target);
-            return loop.apply(this, splinter);
-          });
-
-        } else {
-          if (root[el][target]) {
-            // grab it!
-            return result.push(root[el][target]);
-
-          } else {
-            // dive down a level!
-            return loop.apply(this, [root[el]].concat(args.splice(1)).concat(target));
-
-          }
-        }
-
-      } else if (typeof root === 'object' && root instanceof Array === false && !root[target]) {
-        throw new Error("Target property does not exist", target);
-
-      } else {
-        // dive down a level!
-        return loop.apply(this, [el].concat(args.splice(1)).concat(target));
-      }
-
-      return;
-
-    });
-    if (result.length > 0) {
-      return result;
-    }
-  };
-  return loop.apply(this, arguments);
-}
-
-// Utilities
-// --------------------------------------
-
-// Pure awesomeness by Will Rayner (penguinboy)
-// https://gist.github.com/penguinboy/762197
-function flatten(ob) {
-  var toReturn = {};
-  for (var i in ob) {
-    if (!ob.hasOwnProperty(i)) continue;
-    if ((typeof ob[i]) == 'object' && ob[i] !== null) {
-      var flatObject = flatten(ob[i]);
-      for (var x in flatObject) {
-        if (!flatObject.hasOwnProperty(x)) continue;
-        toReturn[i + '.' + x] = flatObject[x];
-      }
-    } else {
-      toReturn[i] = ob[i];
-    }
-  }
-  return toReturn;
-  /*each(ob, function(value, i){
-    if (typeof value == 'object' && value !== null) {
-      var flatObject = flatten(ob[i]);
-      each(flatObject, function(v2, i2){
-        toReturn[i + '.' + i2] = v2;
-      });
-    } else {
-      toReturn[i] = value;
-    }
-  });*/
-}
-
-// via: https://github.com/spocke/punymce
-function is(o, t){
-  o = typeof(o);
-  if (!t){
-    return o != 'undefined';
-  }
-  return o == t;
-}
-
-function each(o, cb, s){
-  var n;
-  if (!o){
-    return 0;
-  }
-  s = !s ? o : s;
-  if (is(o.length)){
-    // Indexed arrays, needed for Safari
-    for (n=0; n<o.length; n++) {
-      if (cb.call(s, o[n], n, o) === false){
-        return 0;
-      }
-    }
-  } else {
-    // Hashtables
-    for (n in o){
-      if (o.hasOwnProperty(n)) {
-        if (cb.call(s, o[n], n, o) === false){
-          return 0;
-        }
-      }
-    }
-  }
-  return 1;
-}
-
-// Adapted to exclude null values
-function extend(o, e){
-  each(e, function(v, n){
-    if (is(o[n], 'object') && is(v, 'object')){
-      o[n] = extend(o[n], v);
-    } else if (v !== null) {
-      o[n] = v;
-    }
-  });
-  return o;
-}
-
-// Silence moment.js if present
-// if (window.moment) {
-//   moment.suppressDeprecationWarnings = true;
-// }
+var extend = require("../core/utils/extend"),
+    Dataset = require("./dataset");
+
+extend(Dataset.prototype, require("./lib/append"));
+extend(Dataset.prototype, require("./lib/delete"));
+extend(Dataset.prototype, require("./lib/filter"));
+extend(Dataset.prototype, require("./lib/insert"));
+extend(Dataset.prototype, require("./lib/select"));
+extend(Dataset.prototype, require("./lib/sort"));
+extend(Dataset.prototype, require("./lib/update"));
+
+extend(Dataset.prototype, require("./lib/analyses"));
+extend(Dataset.prototype, {
+  "format": require("./lib/format"),
+});
+
+module.exports = Dataset;
diff --git a/src/dataset/lib/analyses.js b/src/dataset/lib/analyses.js
new file mode 100644
index 0000000..e75af52
--- /dev/null
+++ b/src/dataset/lib/analyses.js
@@ -0,0 +1,71 @@
+var each = require("../../core/utils/each"),
+    arr = ["Average", "Maximum", "Minimum", "Sum"],
+    output = {};
+
+output["average"] = function(arr, start, end){
+  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
+      sum = 0,
+      avg = null;
+
+  // Add numeric values
+  each(set, function(val, i){
+    if (typeof val === "number" && !isNaN(parseFloat(val))) {
+      sum += parseFloat(val);
+    }
+  });
+  return sum / set.length;
+};
+
+output["maximum"] = function(arr, start, end){
+  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
+      nums = [];
+
+  // Pull numeric values
+  each(set, function(val, i){
+    if (typeof val === "number" && !isNaN(parseFloat(val))) {
+      nums.push(parseFloat(val));
+    }
+  });
+  return Math.max.apply(Math, nums);
+};
+
+output["minimum"] = function(arr, start, end){
+  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
+      nums = [];
+
+  // Pull numeric values
+  each(set, function(val, i){
+    if (typeof val === "number" && !isNaN(parseFloat(val))) {
+      nums.push(parseFloat(val));
+    }
+  });
+  return Math.min.apply(Math, nums);
+};
+
+output["sum"] = function(arr, start, end){
+  // Copy set with given range
+  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
+      sum = 0;
+
+  // Add numeric values
+  each(set, function(val, i){
+    if (typeof val === "number" && !isNaN(parseFloat(val))) {
+      sum += parseFloat(val);
+    }
+  });
+  return sum;
+};
+
+// Convenience methods
+
+each(arr, function(v,i){
+  output["getColumn"+v] = output["getRow"+v] = function(arr){
+    return this[v.toLowerCase()](arr, 1);
+  };
+});
+
+output["getColumnLabel"] = output["getRowIndex"] = function(arr){
+  return arr[0];
+};
+
+module.exports = output;
diff --git a/src/dataset/lib/append.js b/src/dataset/lib/append.js
new file mode 100644
index 0000000..35e238b
--- /dev/null
+++ b/src/dataset/lib/append.js
@@ -0,0 +1,77 @@
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "appendColumn": appendColumn,
+  "appendRow": appendRow
+};
+
+function appendColumn(str, input){
+  var self = this,
+      args = Array.prototype.slice.call(arguments, 2),
+      label = (str !== undefined) ? str : null;
+
+  if (typeof input === "function") {
+    self.data.output[0].push(label);
+    each(self.output(), function(row, i){
+      var cell;
+      if (i > 0) {
+        cell = input.call(self, row, i);
+        if (typeof cell === "undefined") {
+          cell = null;
+        }
+        self.data.output[i].push(cell);
+      }
+    });
+  }
+
+  else if (!input || input instanceof Array) {
+    self.data.output[0].push(label);
+    each(self.output(), function(row, i){
+      var cell;
+      if (i > 0) {
+        cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
+        self.data.output[i].push(cell);
+      }
+    });
+
+  }
+
+  return self;
+}
+
+function appendRow(str, input){
+  var self = this,
+      args = Array.prototype.slice.call(arguments, 2),
+      label = (str !== undefined) ? str : null,
+      newRow = [];
+
+  newRow.push(label);
+
+  if (typeof input === "function") {
+    each(self.output()[0], function(label, i){
+      var col, cell;
+      if (i > 0) {
+        col = self.selectColumn(i);
+        cell = input.call(self, col, i);
+        if (typeof cell === "undefined") {
+          cell = null;
+        }
+        newRow.push(cell);
+      }
+    });
+    self.data.output.push(newRow);
+  }
+
+  else if (!input || input instanceof Array) {
+    each(self.output()[0], function(label, i){
+      var cell;
+      if (i > 0) {
+        cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
+        newRow.push(cell);
+      }
+    });
+    this.data.output.push(newRow);
+  }
+
+  return this;
+}
diff --git a/src/dataset/lib/appendColumn.js b/src/dataset/lib/appendColumn.js
deleted file mode 100644
index c746763..0000000
--- a/src/dataset/lib/appendColumn.js
+++ /dev/null
@@ -1,33 +0,0 @@
-Keen.Dataset.prototype.appendColumn = function(str, input){
-  var self = this,
-      args = Array.prototype.slice.call(arguments, 2),
-      label = (str !== undefined) ? str : null;
-
-  if (typeof input === "function") {
-    self.data.output[0].push(label);
-    each(self.output(), function(row, i){
-      var cell;
-      if (i > 0) {
-        cell = input.call(self, row, i);
-        if (typeof cell === "undefined") {
-          cell = null;
-        }
-        self.data.output[i].push(cell);
-      }
-    });
-  }
-
-  else if (!input || input instanceof Array) {
-    self.data.output[0].push(label);
-    each(self.output(), function(row, i){
-      var cell;
-      if (i > 0) {
-        cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
-        self.data.output[i].push(cell);
-      }
-    });
-
-  }
-
-  return self;
-};
diff --git a/src/dataset/lib/appendRow.js b/src/dataset/lib/appendRow.js
deleted file mode 100644
index caece76..0000000
--- a/src/dataset/lib/appendRow.js
+++ /dev/null
@@ -1,36 +0,0 @@
-Keen.Dataset.prototype.appendRow = function(str, input){
-  var self = this,
-      args = Array.prototype.slice.call(arguments, 2),
-      label = (str !== undefined) ? str : null,
-      newRow = [];
-
-  newRow.push(label);
-
-  if (typeof input === "function") {
-    each(self.output()[0], function(label, i){
-      var col, cell;
-      if (i > 0) {
-        col = self.selectColumn(i);
-        cell = input.call(self, col, i);
-        if (typeof cell === "undefined") {
-          cell = null;
-        }
-        newRow.push(cell);
-      }
-    });
-    self.data.output.push(newRow);
-  }
-
-  else if (!input || input instanceof Array) {
-    each(self.output()[0], function(label, i){
-      var cell;
-      if (i > 0) {
-        cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
-        newRow.push(cell);
-      }
-    });
-    this.data.output.push(newRow);
-  }
-
-  return this;
-};
diff --git a/src/dataset/lib/delete.js b/src/dataset/lib/delete.js
new file mode 100644
index 0000000..5e9da66
--- /dev/null
+++ b/src/dataset/lib/delete.js
@@ -0,0 +1,26 @@
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "deleteColumn": deleteColumn,
+  "deleteRow": deleteRow
+};
+
+function deleteColumn(q){
+  var self = this,
+  index = (!isNaN(parseInt(q))) ? q : this.output()[0].indexOf(q);
+
+  if (index > -1) {
+    each(self.data.output, function(row, i){
+      self.data.output[i].splice(index, 1);
+    });
+  }
+  return self;
+}
+
+function deleteRow(q){
+  var index = (!isNaN(parseInt(q))) ? q : this.selectColumn(0).indexOf(q);
+  if (index > -1) {
+    this.data.output.splice(index, 1);
+  }
+  return this;
+}
diff --git a/src/dataset/lib/filter.js b/src/dataset/lib/filter.js
new file mode 100644
index 0000000..119abf8
--- /dev/null
+++ b/src/dataset/lib/filter.js
@@ -0,0 +1,41 @@
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "filterColumns": filterColumns,
+  "filterRows": filterRows
+};
+
+function filterColumns(fn){
+  var self = this,
+      clone = new Array();
+
+  each(self.data.output, function(row, i){
+    clone.push([]);
+  });
+
+  each(self.data.output[0], function(col, i){
+    var selectedColumn = self.selectColumn(i);
+    if (i == 0 || fn.call(self, selectedColumn, i)) {
+      each(selectedColumn, function(cell, ri){
+        clone[ri].push(cell);
+      });
+    }
+  });
+
+  self.output(clone);
+  return self;
+}
+
+function filterRows(fn){
+  var self = this,
+      clone = [];
+
+  each(self.output(), function(row, i){
+    if (i == 0 || fn.call(self, row, i)) {
+      clone.push(row);
+    }
+  });
+
+  self.output(clone);
+  return self;
+}
diff --git a/src/dataset/lib/filterColumns.js b/src/dataset/lib/filterColumns.js
deleted file mode 100644
index abd2b1f..0000000
--- a/src/dataset/lib/filterColumns.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Keen.Dataset.prototype.filterColumns = function(fn){
-  var self = this, clone = new Array();
-  each(self.data.output, function(row, i){
-    clone.push([]);
-  });
-  each(self.data.output[0], function(col, i){
-    var selectedColumn = self.selectColumn(i);
-    if (i == 0 || fn.call(self, selectedColumn, i)) {
-      each(selectedColumn, function(cell, ri){
-        clone[ri].push(cell);
-      });
-    }
-  });
-  self.output(clone);
-  return self;
-};
diff --git a/src/dataset/lib/filterRows.js b/src/dataset/lib/filterRows.js
deleted file mode 100644
index c7e46dd..0000000
--- a/src/dataset/lib/filterRows.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Keen.Dataset.prototype.filterRows = function(fn){
-  var self = this,
-      clone = [];
-  each(self.data.output, function(row, i){
-    if (i == 0 || fn.call(self, row, i)) {
-      clone.push(row);
-    }
-  });
-  self.output(clone);
-  return self;
-};
diff --git a/src/dataset/lib/format.js b/src/dataset/lib/format.js
index 26b0637..22a691d 100644
--- a/src/dataset/lib/format.js
+++ b/src/dataset/lib/format.js
@@ -1,4 +1,6 @@
-Keen.Dataset.prototype.format = function(options){
+var each = require("../../core/utils/each");
+
+module.exports = function(options){
   var self = this;
 
     if (this.method() === 'select') {
diff --git a/src/dataset/lib/helpers/average.js b/src/dataset/lib/helpers/average.js
deleted file mode 100644
index 0cac0e1..0000000
--- a/src/dataset/lib/helpers/average.js
+++ /dev/null
@@ -1,20 +0,0 @@
-Keen.Dataset.prototype.average = function(arr, start, end){
-  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
-      sum = 0,
-      avg = null;
-
-  // Add numeric values
-  each(set, function(val, i){
-    if (typeof val === "number" && !isNaN(parseFloat(val))) {
-      sum += parseFloat(val);
-    }
-  });
-  return sum / set.length;
-};
-
-Keen.Dataset.prototype.getColumnAverage = function(arr){
-  return this.average(arr, 1);
-};
-Keen.Dataset.prototype.getRowAverage = function(arr){
-  return this.average(arr, 1);
-};
diff --git a/src/dataset/lib/helpers/maximum.js b/src/dataset/lib/helpers/maximum.js
deleted file mode 100644
index eda0cea..0000000
--- a/src/dataset/lib/helpers/maximum.js
+++ /dev/null
@@ -1,19 +0,0 @@
-Keen.Dataset.prototype.maximum = function(arr, start, end){
-  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
-      nums = [];
-
-  // Pull numeric values
-  each(set, function(val, i){
-    if (typeof val === "number" && !isNaN(parseFloat(val))) {
-      nums.push(parseFloat(val));
-    }
-  });
-  return Math.max.apply(Math, nums);
-};
-
-Keen.Dataset.prototype.getColumnMaximum = function(arr){
-  return this.maximum(arr, 1);
-};
-Keen.Dataset.prototype.getRowMaximum = function(arr){
-  return this.maximum(arr, 1);
-};
diff --git a/src/dataset/lib/helpers/minimum.js b/src/dataset/lib/helpers/minimum.js
deleted file mode 100644
index 80e3b9a..0000000
--- a/src/dataset/lib/helpers/minimum.js
+++ /dev/null
@@ -1,19 +0,0 @@
-Keen.Dataset.prototype.minimum = function(arr, start, end){
-  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
-      nums = [];
-
-  // Pull numeric values
-  each(set, function(val, i){
-    if (typeof val === "number" && !isNaN(parseFloat(val))) {
-      nums.push(parseFloat(val));
-    }
-  });
-  return Math.min.apply(Math, nums);
-};
-
-Keen.Dataset.prototype.getColumnMinimum = function(arr){
-  return this.minimum(arr, 1);
-};
-Keen.Dataset.prototype.getRowMinimum = function(arr){
-  return this.minimum(arr, 1);
-};
diff --git a/src/dataset/lib/helpers/pick.js b/src/dataset/lib/helpers/pick.js
deleted file mode 100644
index 50b8779..0000000
--- a/src/dataset/lib/helpers/pick.js
+++ /dev/null
@@ -1,10 +0,0 @@
-Keen.Dataset.prototype.pick = function(arr, i){
-  return arr[i];
-};
-
-Keen.Dataset.prototype.getColumnLabel = function(arr){
-  return this.pick(arr, 0);
-};
-Keen.Dataset.prototype.getRowIndex = function(arr){
-  return this.pick(arr, 0);
-};
diff --git a/src/dataset/lib/helpers/sum.js b/src/dataset/lib/helpers/sum.js
deleted file mode 100644
index 730c892..0000000
--- a/src/dataset/lib/helpers/sum.js
+++ /dev/null
@@ -1,21 +0,0 @@
-Keen.Dataset.prototype.sum = function(arr, start, end){
-  // Copy set with given range
-  var set = arr.slice(start||0, (end ? end+1 : arr.length)),
-      sum = 0;
-
-  // Add numeric values
-  each(set, function(val, i){
-    if (typeof val === "number" && !isNaN(parseFloat(val))) {
-      sum += parseFloat(val);
-    }
-  });
-  return sum;
-};
-
-
-Keen.Dataset.prototype.getColumnSum = function(arr){
-  return this.sum(arr, 1);
-};
-Keen.Dataset.prototype.getRowSum = function(arr){
-  return this.sum(arr, 1);
-};
diff --git a/src/dataset/lib/insert.js b/src/dataset/lib/insert.js
new file mode 100644
index 0000000..4c79378
--- /dev/null
+++ b/src/dataset/lib/insert.js
@@ -0,0 +1,77 @@
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "insertColumn": insertColumn,
+  "insertRow": insertRow
+};
+
+function insertColumn(index, str, input){
+  var self = this, label;
+
+  label = (str !== undefined) ? str : null;
+
+  if (typeof input === "function") {
+
+    self.data.output[0].splice(index, 0, label);
+    each(self.output(), function(row, i){
+      var cell;
+      if (i > 0) {
+        cell = input.call(self, row, i);
+        if (typeof cell === "undefined") {
+          cell = null;
+        }
+        self.data.output[i].splice(index, 0, cell);
+      }
+    });
+
+  }
+
+  else if (!input || input instanceof Array) {
+
+    self.data.output[0].splice(index, 0, label);
+    each(self.output(), function(row, i){
+      var cell;
+      if (i > 0) {
+        cell = (input && input[i-1] !== "undefined") ? input[i-1] : null;
+        self.data.output[i].splice(index, 0, cell);
+      }
+    });
+
+  }
+  return self;
+}
+
+function insertRow(index, str, input){
+  var self = this, label, newRow = [];
+
+  label = (str !== undefined) ? str : null;
+  newRow.push(label);
+
+  if (typeof input === "function") {
+    each(self.output()[0], function(label, i){
+      var col, cell;
+      if (i > 0) {
+        col = self.selectColumn(i);
+        cell = input.call(self, col, i);
+        if (typeof cell === "undefined") {
+          cell = null;
+        }
+        newRow.push(cell);
+      }
+    });
+    self.data.output.splice(index, 0, newRow);
+  }
+
+  else if (!input || input instanceof Array) {
+    each(self.output()[0], function(label, i){
+      var cell;
+      if (i > 0) {
+        cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
+        newRow.push(cell);
+      }
+    });
+    this.data.output.splice(index, 0, newRow);
+  }
+
+  return this;
+}
diff --git a/src/dataset/lib/insertColumn.js b/src/dataset/lib/insertColumn.js
deleted file mode 100644
index e3b9f97..0000000
--- a/src/dataset/lib/insertColumn.js
+++ /dev/null
@@ -1,35 +0,0 @@
-Keen.Dataset.prototype.insertColumn = function(index, str, input){
-  var self = this, label;
-
-  label = (str !== undefined) ? str : null;
-
-  if (typeof input === "function") {
-
-    self.data.output[0].splice(index, 0, label);
-    each(self.output(), function(row, i){
-      var cell;
-      if (i > 0) {
-        cell = input.call(self, row, i);
-        if (typeof cell === "undefined") {
-          cell = null;
-        }
-        self.data.output[i].splice(index, 0, cell);
-      }
-    });
-
-  }
-
-  else if (!input || input instanceof Array) {
-
-    self.data.output[0].splice(index, 0, label);
-    each(self.output(), function(row, i){
-      var cell;
-      if (i > 0) {
-        cell = (input && input[i-1] !== "undefined") ? input[i-1] : null;
-        self.data.output[i].splice(index, 0, cell);
-      }
-    });
-
-  }
-  return self;
-};
diff --git a/src/dataset/lib/insertRow.js b/src/dataset/lib/insertRow.js
deleted file mode 100644
index c8c742c..0000000
--- a/src/dataset/lib/insertRow.js
+++ /dev/null
@@ -1,34 +0,0 @@
-Keen.Dataset.prototype.insertRow = function(index, str, input){
-  var self = this, label, newRow = [];
-
-  label = (str !== undefined) ? str : null;
-  newRow.push(label);
-
-  if (typeof input === "function") {
-    each(self.output()[0], function(label, i){
-      var col, cell;
-      if (i > 0) {
-        col = self.selectColumn(i);
-        cell = input.call(self, col, i);
-        if (typeof cell === "undefined") {
-          cell = null;
-        }
-        newRow.push(cell);
-      }
-    });
-    self.data.output.splice(index, 0, newRow);
-  }
-
-  else if (!input || input instanceof Array) {
-    each(self.output()[0], function(label, i){
-      var cell;
-      if (i > 0) {
-        cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
-        newRow.push(cell);
-      }
-    });
-    this.data.output.splice(index, 0, newRow);
-  }
-
-  return this;
-};
diff --git a/src/dataset/lib/removeColumn.js b/src/dataset/lib/removeColumn.js
deleted file mode 100644
index 92dcfa7..0000000
--- a/src/dataset/lib/removeColumn.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Keen.Dataset.prototype.deleteColumn = function(q){
-  var self = this,
-      index = (!isNaN(parseInt(q))) ? q : this.output()[0].indexOf(q);
-
-  if (index > -1) {
-    each(self.data.output, function(row, i){
-      self.data.output[i].splice(index, 1);
-    });
-  }
-  return self;
-};
diff --git a/src/dataset/lib/removeRow.js b/src/dataset/lib/removeRow.js
deleted file mode 100644
index 158b370..0000000
--- a/src/dataset/lib/removeRow.js
+++ /dev/null
@@ -1,8 +0,0 @@
-Keen.Dataset.prototype.deleteRow = function(q){
-  var index = (!isNaN(parseInt(q))) ? q : this.selectColumn(0).indexOf(q);
-
-  if (index > -1) {
-    this.data.output.splice(index, 1);
-  }
-  return this;
-};
diff --git a/src/dataset/lib/select.js b/src/dataset/lib/select.js
new file mode 100644
index 0000000..f1906bf
--- /dev/null
+++ b/src/dataset/lib/select.js
@@ -0,0 +1,25 @@
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "selectColumn": selectColumn,
+  "selectRow": selectRow
+};
+
+function selectColumn(q){
+  var result = new Array(),
+      index = (!isNaN(parseInt(q))) ? q : this.output()[0].indexOf(q);
+
+  if (index > -1) {
+    each(this.data.output, function(row, i){
+      result.push(row[index]);
+    });
+  }
+  return result;
+}
+
+function selectRow(q){
+  var index = (!isNaN(parseInt(q))) ? q : this.selectColumn(0).indexOf(q);
+  if (index > -1) {
+    return this.data.output[index];
+  }
+}
diff --git a/src/dataset/lib/selectColumn.js b/src/dataset/lib/selectColumn.js
deleted file mode 100644
index a9e13db..0000000
--- a/src/dataset/lib/selectColumn.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Keen.Dataset.prototype.selectColumn = function(q){
-  var result = new Array(),
-      index = (!isNaN(parseInt(q))) ? q : this.output()[0].indexOf(q);
-
-  if (index > -1) {
-    each(this.data.output, function(row, i){
-      result.push(row[index]);
-    });
-  }
-  return result;
-};
diff --git a/src/dataset/lib/selectRow.js b/src/dataset/lib/selectRow.js
deleted file mode 100644
index 85c64ef..0000000
--- a/src/dataset/lib/selectRow.js
+++ /dev/null
@@ -1,6 +0,0 @@
-Keen.Dataset.prototype.selectRow = function(q){
-  var index = (!isNaN(parseInt(q))) ? q : this.selectColumn(0).indexOf(q);
-  if (index > -1) {
-    return this.data.output[index];
-  }
-};
diff --git a/src/dataset/lib/sortColumns.js b/src/dataset/lib/sort.js
similarity index 51%
rename from src/dataset/lib/sortColumns.js
rename to src/dataset/lib/sort.js
index e83f86f..f494f64 100644
--- a/src/dataset/lib/sortColumns.js
+++ b/src/dataset/lib/sort.js
@@ -1,4 +1,11 @@
-Keen.Dataset.prototype.sortColumns = function(str, comp){
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "sortColumns": sortColumns,
+  "sortRows": sortRows
+};
+
+function sortColumns(str, comp){
   var self = this,
       head = this.output()[0].slice(1), // minus index
       cols = [],
@@ -26,4 +33,25 @@ Keen.Dataset.prototype.sortColumns = function(str, comp){
       .insertColumn(i+1, col[0], col.slice(1));
   });
   return self;
-};
+}
+
+function sortRows(str, comp){
+  var self = this,
+      head = this.output().slice(0,1),
+      body = this.output().slice(1),
+      fn = comp || this.getRowIndex;
+
+  body.sort(function(a, b){
+    // If fn(a) > fn(b)
+    var op = fn.call(self, a) > fn.call(self, b);
+    if (op) {
+      return (str === "asc" ? 1 : -1);
+    } else if (!op) {
+      return (str === "asc" ? -1 : 1);
+    } else {
+      return 0;
+    }
+  });
+  self.output(head.concat(body));
+  return self;
+}
diff --git a/src/dataset/lib/sortRows.js b/src/dataset/lib/sortRows.js
deleted file mode 100644
index ca5e995..0000000
--- a/src/dataset/lib/sortRows.js
+++ /dev/null
@@ -1,20 +0,0 @@
-Keen.Dataset.prototype.sortRows = function(str, comp){
-  var self = this,
-      head = this.output().slice(0,1),
-      body = this.output().slice(1),
-      fn = comp || this.getRowIndex;
-
-  body.sort(function(a, b){
-    // If fn(a) > fn(b)
-    var op = fn.call(self, a) > fn.call(self, b);
-    if (op) {
-      return (str === "asc" ? 1 : -1);
-    } else if (!op) {
-      return (str === "asc" ? -1 : 1);
-    } else {
-      return 0;
-    }
-  });
-  self.output(head.concat(body));
-  return self;
-};
diff --git a/src/dataset/lib/update.js b/src/dataset/lib/update.js
new file mode 100644
index 0000000..e3e08a6
--- /dev/null
+++ b/src/dataset/lib/update.js
@@ -0,0 +1,74 @@
+var each = require("../../core/utils/each");
+
+module.exports = {
+  "updateColumn": updateColumn,
+  "updateRow": updateRow
+};
+
+function updateColumn(q, input){
+  var self = this, index;
+
+  index = (!isNaN(parseInt(q))) ? q : this.output()[0].indexOf(q);
+
+  if (index > -1) {
+
+    if (typeof input === "function") {
+
+      each(self.output(), function(row, i){
+        var cell;
+        if (i > 0) {
+          cell = input.call(self, row[index], i, row);
+          if (typeof cell !== "undefined") {
+            self.data.output[i][index] = cell;
+          }
+        }
+      });
+
+    } else if (!input || input instanceof Array) {
+
+      each(self.output(), function(row, i){
+        var cell;
+        if (i > 0) {
+          cell = (input && typeof input[i-1] !== "undefined" ? input[i-1] : null);
+          self.data.output[i][index] = cell;
+        }
+      });
+
+    }
+
+  }
+  return self;
+}
+
+function updateRow(q, input){
+  var self = this, index;
+
+  index = (!isNaN(parseInt(q))) ? q : this.selectColumn(0).indexOf(q);
+
+  if (index > -1) {
+
+    if (typeof input === "function") {
+
+      each(self.output()[index], function(value, i){
+        var col = self.selectColumn(i),
+        cell = input.call(self, value, i, col);
+        if (typeof cell !== "undefined") {
+          self.data.output[index][i] = cell;
+        }
+      });
+
+    } else if (!input || input instanceof Array) {
+
+      each(self.output()[index], function(c, i){
+        var cell;
+        if (i > 0) {
+          cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
+          self.data.output[index][i] = cell;
+        }
+      });
+
+    }
+
+  }
+  return self;
+}
diff --git a/src/dataset/lib/updateColumn.js b/src/dataset/lib/updateColumn.js
deleted file mode 100644
index 97f1d1d..0000000
--- a/src/dataset/lib/updateColumn.js
+++ /dev/null
@@ -1,34 +0,0 @@
-Keen.Dataset.prototype.updateColumn = function(q, input){
-  var self = this, index;
-
-  index = (!isNaN(parseInt(q))) ? q : this.output()[0].indexOf(q);
-
-  if (index > -1) {
-
-    if (typeof input === "function") {
-
-      each(self.output(), function(row, i){
-        var cell;
-        if (i > 0) {
-          cell = input.call(self, row[index], i, row);
-          if (typeof cell !== "undefined") {
-            self.data.output[i][index] = cell;
-          }
-        }
-      });
-
-    } else if (!input || input instanceof Array) {
-
-      each(self.output(), function(row, i){
-        var cell;
-        if (i > 0) {
-          cell = (input && typeof input[i-1] !== "undefined" ? input[i-1] : null);
-          self.data.output[i][index] = cell;
-        }
-      });
-
-    }
-
-  }
-  return self;
-};
diff --git a/src/dataset/lib/updateRow.js b/src/dataset/lib/updateRow.js
deleted file mode 100644
index c950ab0..0000000
--- a/src/dataset/lib/updateRow.js
+++ /dev/null
@@ -1,32 +0,0 @@
-Keen.Dataset.prototype.updateRow = function(q, input){
-  var self = this, index;
-
-  index = (!isNaN(parseInt(q))) ? q : this.selectColumn(0).indexOf(q);
-
-  if (index > -1) {
-
-    if (typeof input === "function") {
-
-      each(self.output()[index], function(value, i){
-        var col = self.selectColumn(i),
-            cell = input.call(self, value, i, col);
-        if (typeof cell !== "undefined") {
-          self.data.output[index][i] = cell;
-        }
-      });
-
-    } else if (!input || input instanceof Array) {
-
-      each(self.output()[index], function(c, i){
-        var cell;
-        if (i > 0) {
-          cell = (input && input[i-1] !== undefined) ? input[i-1] : null;
-          self.data.output[index][i] = cell;
-        }
-      });
-
-    }
-
-  }
-  return self;
-};
diff --git a/src/dataset/utils/flatten.js b/src/dataset/utils/flatten.js
new file mode 100644
index 0000000..7d89d85
--- /dev/null
+++ b/src/dataset/utils/flatten.js
@@ -0,0 +1,19 @@
+// Pure awesomeness by Will Rayner (penguinboy)
+// https://gist.github.com/penguinboy/762197
+module.exports = flatten;
+function flatten(ob) {
+  var toReturn = {};
+  for (var i in ob) {
+    if (!ob.hasOwnProperty(i)) continue;
+    if ((typeof ob[i]) == 'object' && ob[i] !== null) {
+      var flatObject = flatten(ob[i]);
+      for (var x in flatObject) {
+        if (!flatObject.hasOwnProperty(x)) continue;
+        toReturn[i + '.' + x] = flatObject[x];
+      }
+    } else {
+      toReturn[i] = ob[i];
+    }
+  }
+  return toReturn;
+}
diff --git a/src/dataset/utils/parse.js b/src/dataset/utils/parse.js
new file mode 100644
index 0000000..9dcbf0b
--- /dev/null
+++ b/src/dataset/utils/parse.js
@@ -0,0 +1,75 @@
+// ♫♩♬ Holy Diver! ♬♩♫
+// --------------------------------------
+
+var each = require("../../core/utils/each");
+
+module.exports = function() {
+  var result = [];
+  var loop = function() {
+    var root = arguments[0];
+    var args = Array.prototype.slice.call(arguments, 1);
+    var target = args.pop();
+
+    if (args.length === 0) {
+      if (root instanceof Array) {
+        args = root;
+      } else if (typeof root === 'object') {
+        args.push(root);
+      }
+    }
+
+    each(args, function(el){
+
+      // Grab the numbers and nulls
+      if (target == "") {
+        if (typeof el == "number" || el == null) {
+          return result.push(el);
+        }
+      }
+
+      if (el[target] || el[target] === 0 || el[target] !== void 0) {
+        // Easy grab!
+        if (el[target] === null) {
+          return result.push(null);
+        } else {
+          return result.push(el[target]);
+        }
+
+      } else if (root[el]){
+        if (root[el] instanceof Array) {
+          // dive through each array item
+
+          each(root[el], function(n, i) {
+            var splinter = [root[el]].concat(root[el][i]).concat(args.slice(1)).concat(target);
+            return loop.apply(this, splinter);
+          });
+
+        } else {
+          if (root[el][target]) {
+            // grab it!
+            return result.push(root[el][target]);
+
+          } else {
+            // dive down a level!
+            return loop.apply(this, [root[el]].concat(args.splice(1)).concat(target));
+
+          }
+        }
+
+      } else if (typeof root === 'object' && root instanceof Array === false && !root[target]) {
+        throw new Error("Target property does not exist", target);
+
+      } else {
+        // dive down a level!
+        return loop.apply(this, [el].concat(args.splice(1)).concat(target));
+      }
+
+      return;
+
+    });
+    if (result.length > 0) {
+      return result;
+    }
+  };
+  return loop.apply(this, arguments);
+}
diff --git a/src/dataviz/adapters/c3.js b/src/dataviz/adapters/c3.js
index eba6064..50f524b 100644
--- a/src/dataviz/adapters/c3.js
+++ b/src/dataviz/adapters/c3.js
@@ -4,8 +4,11 @@
  * ----------------------
  */
 
-(function(lib){
-  var Keen = lib || {};
+var Dataviz = require("../dataviz"),
+    each = require("../../core/utils/each"),
+    extend = require("../../core/utils/extend");
+
+module.exports = function(){
 
   // chartOptions:
   // -------------
@@ -34,7 +37,7 @@
   };
 
   var charts = {};
-  Keen.utils.each(["gauge", "donut", "pie", "bar", "area", "area-spline", "spline", "line", "step", "area-step"], function(type, index){
+  each(["gauge", "donut", "pie", "bar", "area", "area-spline", "spline", "line", "step", "area-step"], function(type, index){
     charts[type] = {
       render: function(){
         var setup = getSetupTemplate.call(this, type);
@@ -58,7 +61,7 @@
             cols.push(self.dataset.selectColumn(0));
             cols[0][0] = 'x';
           }
-          Keen.utils.each(self.data()[0], function(c, i){
+          each(self.data()[0], function(c, i){
             if (i > 0) {
               cols.push(self.dataset.selectColumn(i));
             }
@@ -111,7 +114,7 @@
         };
       }
     }
-    return Keen.utils.extend(setup, this.chartOptions());
+    return extend(setup, this.chartOptions());
   }
 
   function _selfDestruct(){
@@ -123,6 +126,6 @@
 
   // Register library + add dependencies + types
   // -------------------------------
-  Keen.Dataviz.register('c3', charts, { capabilities: dataTypes });
+  Dataviz.register('c3', charts, { capabilities: dataTypes });
 
-})(Keen);
+};
diff --git a/src/dataviz/adapters/chartjs.js b/src/dataviz/adapters/chartjs.js
index 5ec2fcc..61c9ef6 100644
--- a/src/dataviz/adapters/chartjs.js
+++ b/src/dataviz/adapters/chartjs.js
@@ -4,8 +4,11 @@
  * ----------------------
  */
 
-(function(lib){
-  var Keen = lib || {};
+var Dataviz = require("../dataviz"),
+    each = require("../../core/utils/each"),
+    extend = require("../../core/utils/extend");
+
+module.exports = function(){
 
   if (typeof Chart !== "undefined") {
     Chart.defaults.global.responsive = true;
@@ -42,7 +45,7 @@
 
   function getCategoricalData(){
     var self = this, result = [];
-    Keen.utils.each(self.dataset.selectColumn(0).slice(1), function(label, i){
+    each(self.dataset.selectColumn(0).slice(1), function(label, i){
       result.push({
         value: self.dataset.selectColumn(1).slice(1)[i],
         color: self.colors()[+i],
@@ -62,7 +65,7 @@
         };
 
     labels = this.dataset.selectColumn(0).slice(1);
-    Keen.utils.each(labels, function(l,i){
+    each(labels, function(l,i){
       if (l instanceof Date) {
         result.labels.push((l.getMonth()+1) + "-" + l.getDate() + "-" + l.getFullYear());
       } else {
@@ -70,7 +73,7 @@
       }
     })
 
-    Keen.utils.each(self.dataset.selectRow(0).slice(1), function(label, i){
+    each(self.dataset.selectRow(0).slice(1), function(label, i){
       var hex = {
         r: hexToR(self.colors()[i]),
         g: hexToG(self.colors()[i]),
@@ -91,7 +94,7 @@
   }
 
   var charts = {};
-  Keen.utils.each(["doughnut", "pie", "polar-area", "radar", "bar", "line"], function(type, index){
+  each(["doughnut", "pie", "polar-area", "radar", "bar", "line"], function(type, index){
     charts[type] = {
       initialize: function(){
         if (this.el().nodeName.toLowerCase() !== "canvas") {
@@ -106,7 +109,7 @@
       },
       render: function(){
         var method = ChartNameMap[type],
-            opts = _extend({}, this.chartOptions()),
+            opts = extend({}, this.chartOptions()),
             data = dataTransformers[type].call(this);
 
         if (this.view._artifacts["chartjs"]) {
@@ -138,6 +141,6 @@
 
   // Register library + add dependencies + types
   // -------------------------------
-  Keen.Dataviz.register("chartjs", charts, { capabilities: dataTypes });
+  Dataviz.register("chartjs", charts, { capabilities: dataTypes });
 
-})(Keen);
+};
diff --git a/src/dataviz/adapters/google.js b/src/dataviz/adapters/google.js
index ae52213..2a70c6c 100644
--- a/src/dataviz/adapters/google.js
+++ b/src/dataviz/adapters/google.js
@@ -14,8 +14,14 @@
 
 */
 
-(function(lib){
-  var Keen = lib || {};
+var Dataviz = require("../dataviz"),
+    each = require("../../core/utils/each"),
+    extend = require("../../core/utils/extend"),
+    Keen = require("../../core");
+
+module.exports = function(){
+
+  Keen.loaded = false;
 
   var errors = {
     "google-visualization-errors-0": "No results to visualize"
@@ -38,7 +44,7 @@
 
   // Create chart types
   // -------------------------------
-  Keen.utils.each(chartTypes, function (type) {
+  each(chartTypes, function (type) {
     var name = type.toLowerCase();
     chartMap[name] = {
       initialize: function(){
@@ -61,7 +67,7 @@
       },
       update: function(){
         var options = _getDefaultAttributes.call(this, type);
-        Keen.utils.extend(options, this.chartOptions(), this.attributes());
+        extend(options, this.chartOptions(), this.attributes());
         this.view._artifacts['datatable'] = google.visualization.arrayToDataTable(this.data());
         // if (this.view._artifacts['datatable']) {}
         if (this.view._artifacts['googlechart']) {
@@ -83,16 +89,17 @@
   // Register library + types
   // -------------------------------
 
-  Keen.Dataviz.register('google', chartMap, {
+  Dataviz.register('google', chartMap, {
     capabilities: dataTypes,
     dependencies: [{
       type: 'script',
       url: 'https://www.google.com/jsapi',
       cb: function(done) {
         if (typeof google === 'undefined'){
-          Keen.log("Problem loading Google Charts library. Please contact us!");
+          this.trigger("error", "Problem loading Google Charts library. Please contact us!");
           done();
-        } else {
+        }
+        else {
           google.load('visualization', '1.1', {
               packages: ['corechart', 'table'],
               callback: function(){
@@ -194,4 +201,4 @@
     return output;
   }
 
-})(Keen);
+};
diff --git a/src/dataviz/adapters/keen-io.js b/src/dataviz/adapters/keen-io.js
index 5e2c46b..1b5608f 100644
--- a/src/dataviz/adapters/keen-io.js
+++ b/src/dataviz/adapters/keen-io.js
@@ -1,149 +1,164 @@
-  /*!
-  * ----------------------
-  * Keen IO Adapter
-  * ----------------------
-  */
-
-  (function(lib){
-    var Keen = lib || {},
-        Metric, Error, Spinner;
-
-    Keen.Error = {
-      defaults: {
-        backgroundColor : "",
-        borderRadius    : "4px",
-        color           : "#ccc",
-        display         : "block",
-        fontFamily      : "Helvetica Neue, Helvetica, Arial, sans-serif",
-        fontSize        : "21px",
-        fontWeight      : "light",
-        textAlign       : "center"
+/*!
+* ----------------------
+* Keen IO Adapter
+* ----------------------
+*/
+
+var Keen = require("../../core"),
+    Dataviz = require("../dataviz");
+
+var clone = require("../../core/utils/clone"),
+    each = require("../../core/utils/each"),
+    extend = require("../../core/utils/extend"),
+    prettyNumber = require("../utils/prettyNumber");
+
+module.exports = function(){
+  // (function(lib){
+  // var Keen = lib || {},
+  var Metric, Error, Spinner;
+
+  Keen.Error = {
+    defaults: {
+      backgroundColor : "",
+      borderRadius    : "4px",
+      color           : "#ccc",
+      display         : "block",
+      fontFamily      : "Helvetica Neue, Helvetica, Arial, sans-serif",
+      fontSize        : "21px",
+      fontWeight      : "light",
+      textAlign       : "center"
+    }
+  };
+
+  Keen.Spinner.defaults = {
+    lines: 10,                    // The number of lines to draw
+    length: 8,                    // The length of each line
+    width: 3,                     // The line thickness
+    radius: 10,                   // The radius of the inner circle
+    corners: 1,                   // Corner roundness (0..1)
+    rotate: 0,                    // The rotation offset
+    direction: 1,                 // 1: clockwise, -1: counterclockwise
+    color: '#4d4d4d',             // #rgb or #rrggbb or array of colors
+    speed: 1.67,                  // Rounds per second
+    trail: 60,                    // Afterglow percentage
+    shadow: false,                // Whether to render a shadow
+    hwaccel: false,               // Whether to use hardware acceleration
+    className: 'keen-spinner',    // The CSS class to assign to the spinner
+    zIndex: 2e9,                  // The z-index (defaults to 2000000000)
+    top: '50%',                   // Top position relative to parent
+    left: '50%'                   // Left position relative to parent
+  };
+
+  var dataTypes = {
+    'singular': ['metric']
+  };
+
+  Metric = {
+    initialize: function(){
+      var css = document.createElement("style"),
+          bgDefault = "#49c5b1";
+
+      css.id = "keen-widgets";
+      css.type = "text/css";
+      css.innerHTML = "\
+  .keen-metric { \n  background: " + bgDefault + "; \n  border-radius: 4px; \n  color: #fff; \n  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; \n  padding: 10px 0; \n  text-align: center; \n} \
+  .keen-metric-value { \n  display: block; \n  font-size: 84px; \n  font-weight: 700; \n  line-height: 84px; \n} \
+  .keen-metric-title { \n  display: block; \n  font-size: 24px; \n  font-weight: 200; \n}";
+      if (!document.getElementById(css.id)) {
+        document.body.appendChild(css);
       }
-    };
-
-    Keen.Spinner.defaults = {
-      lines: 10,                    // The number of lines to draw
-      length: 8,                    // The length of each line
-      width: 3,                     // The line thickness
-      radius: 10,                   // The radius of the inner circle
-      corners: 1,                   // Corner roundness (0..1)
-      rotate: 0,                    // The rotation offset
-      direction: 1,                 // 1: clockwise, -1: counterclockwise
-      color: '#4d4d4d',             // #rgb or #rrggbb or array of colors
-      speed: 1.67,                  // Rounds per second
-      trail: 60,                    // Afterglow percentage
-      shadow: false,                // Whether to render a shadow
-      hwaccel: false,               // Whether to use hardware acceleration
-      className: 'keen-spinner',    // The CSS class to assign to the spinner
-      zIndex: 2e9,                  // The z-index (defaults to 2000000000)
-      top: '50%',                   // Top position relative to parent
-      left: '50%'                   // Left position relative to parent
-    };
-
-
-    var dataTypes = {
-      'singular': ['metric']
-    };
-
-    Metric = {
-      initialize: function(){
-        var css = document.createElement("style"),
-            bgDefault = "#49c5b1";
-
-        css.id = "keen-widgets";
-        css.type = "text/css";
-        css.innerHTML = "\
-    .keen-metric { \n  background: " + bgDefault + "; \n  border-radius: 4px; \n  color: #fff; \n  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; \n  padding: 10px 0; \n  text-align: center; \n} \
-    .keen-metric-value { \n  display: block; \n  font-size: 84px; \n  font-weight: 700; \n  line-height: 84px; \n} \
-    .keen-metric-title { \n  display: block; \n  font-size: 24px; \n  font-weight: 200; \n}";
-        if (!document.getElementById(css.id)) {
-          document.body.appendChild(css);
+    },
+
+    render: function(){
+      var bgColor = (this.colors().length == 1) ? this.colors()[0] : "#49c5b1",
+          title = this.title() || "Result",
+          value = this.data()[1][1] || 0,
+          width = this.width(),
+          opts = this.chartOptions() || {},
+          prefix = "",
+          suffix = "";
+
+      var styles = {
+        'width': (width) ? width + 'px' : 'auto'
+      };
+
+      var formattedNum = value;
+      if ( typeof opts.prettyNumber === 'undefined' || opts.prettyNumber == true ) {
+        if ( !isNaN(parseInt(value)) ) {
+          formattedNum = prettyNumber(value);
         }
-      },
-
-      render: function(){
-        var bgColor = (this.colors().length == 1) ? this.colors()[0] : "#49c5b1",
-            prefix = "",
-            suffix = "",
-            title = this.title() || "Result",
-            value = this.data()[1][1] || 0,
-            width = this.width(),
-            opts = this.chartOptions() || {};
-
-        if (typeof opts.prettyNumber === 'undefined' || opts.prettyNumber == true) {
-          value = Keen.utils.prettyNumber(value);
-        }
-
-        if (opts['prefix']) {
-          prefix = '<span class="keen-metric-prefix">' + opts['prefix'] + '</span>';
-        }
-        if (opts['suffix']) {
-          suffix = '<span class="keen-metric-suffix">' + opts['suffix'] + '</span>';
-        }
-
-        this.el().innerHTML = '' +
-          '<div class="keen-widget keen-metric" style="background-color: ' + bgColor + '; width:' + width + 'px;">' +
-            '<span class="keen-metric-value">' + prefix + value + suffix + '</span>' +
-            '<span class="keen-metric-title">' + title + '</span>' +
-          '</div>';
       }
-    };
-
-    Error = {
-      initialize: function(){},
-      render: function(text, style){
-        var err, msg;
-
-        var defaultStyle = JSON.parse(JSON.stringify(Keen.Error.defaults));
-        var currentStyle = _extend(defaultStyle, style);
-
-        err = document.createElement("div");
-        err.className = "keen-error";
-        _each(currentStyle, function(value, key){
-          err.style[key] = value;
-        });
-        err.style.height = String(this.height() + "px");
-        err.style.paddingTop = (this.height() / 2 - 15) + "px";
-        err.style.width = String(this.width() + "px");
-
-        msg = document.createElement("span");
-        msg.innerHTML = text || "Yikes! An error occurred!";
-
-        err.appendChild(msg);
-
-        this.el().innerHTML = "";
-        this.el().appendChild(err);
-      },
-      destroy: function(){
-        this.el().innerHTML = "";
+
+      if (opts['prefix']) {
+        prefix = '<span class="keen-metric-prefix">' + opts['prefix'] + '</span>';
       }
-    };
-
-    Spinner = {
-      initialize: function(){},
-      render: function(){
-        var spinner = document.createElement("div");
-        spinner.className = "keen-loading";
-        spinner.style.height = String(this.height() + "px");
-        spinner.style.position = "relative";
-        spinner.style.width = String(this.width() + "px");
-
-        this.el().innerHTML = "";
-        this.el().appendChild(spinner);
-        this.view._artifacts.spinner = new Keen.Spinner(Keen.Spinner.defaults).spin(spinner);
-      },
-      destroy: function(){
-        this.view._artifacts.spinner.stop();
-        this.view._artifacts.spinner = null;
+      if (opts['suffix']) {
+        suffix = '<span class="keen-metric-suffix">' + opts['suffix'] + '</span>';
       }
-    };
-
-    Keen.Dataviz.register('keen-io', {
-      'metric': Metric,
-      'error': Error,
-      'spinner': Spinner
-    }, {
-      capabilities: dataTypes
-    });
 
-  })(Keen);
+      this.el().innerHTML = '' +
+        '<div class="keen-widget keen-metric" style="background-color: ' + bgColor + '; width:' + styles.width + ';" title="' + value + '">' +
+          '<span class="keen-metric-value">' + prefix + formattedNum + suffix + '</span>' +
+          '<span class="keen-metric-title">' + title + '</span>' +
+        '</div>';
+    }
+  };
+
+  Error = {
+    initialize: function(){},
+    render: function(text, style){
+      var err, msg;
+
+      var defaultStyle = clone(Keen.Error.defaults);
+      var currentStyle = extend(defaultStyle, style);
+
+      err = document.createElement("div");
+      err.className = "keen-error";
+      each(currentStyle, function(value, key){
+        err.style[key] = value;
+      });
+      err.style.height = String(this.height() + "px");
+      err.style.paddingTop = (this.height() / 2 - 15) + "px";
+      err.style.width = String(this.width() + "px");
+
+      msg = document.createElement("span");
+      msg.innerHTML = text || "Yikes! An error occurred!";
+
+      err.appendChild(msg);
+
+      this.el().innerHTML = "";
+      this.el().appendChild(err);
+    },
+    destroy: function(){
+      this.el().innerHTML = "";
+    }
+  };
+
+  Spinner = {
+    initialize: function(){},
+    render: function(){
+      var spinner = document.createElement("div");
+      spinner.className = "keen-loading";
+      spinner.style.height = String(this.height() + "px");
+      spinner.style.position = "relative";
+      spinner.style.width = String(this.width() + "px");
+
+      this.el().innerHTML = "";
+      this.el().appendChild(spinner);
+      this.view._artifacts.spinner = new Keen.Spinner(Keen.Spinner.defaults).spin(spinner);
+    },
+    destroy: function(){
+      this.view._artifacts.spinner.stop();
+      this.view._artifacts.spinner = null;
+    }
+  };
+
+  Keen.Dataviz.register('keen-io', {
+    'metric': Metric,
+    'error': Error,
+    'spinner': Spinner
+  }, {
+    capabilities: dataTypes
+  });
+
+}; //)(Keen);
diff --git a/src/dataviz/dataviz.js b/src/dataviz/dataviz.js
new file mode 100644
index 0000000..8cf3ee6
--- /dev/null
+++ b/src/dataviz/dataviz.js
@@ -0,0 +1,128 @@
+var clone = require("../core/utils/clone"),
+    each = require("../core/utils/each"),
+    extend = require("../core/utils/extend"),
+    loadScript = require("./utils/loadScript"),
+    loadStyle = require("./utils/loadStyle");
+
+var Keen = require("../core");
+var Emitter = require('../core/helpers/emitter-shim');
+
+var Dataset = require("../dataset");
+
+function Dataviz(){
+  this.dataset = new Dataset();
+  this.view = {
+    _prepared: false,
+    _initialized: false,
+    _rendered: false,
+    _artifacts: { /* state bin */ },
+    adapter: {
+      library: undefined,
+      chartType: undefined,
+      defaultChartType: undefined,
+      dataType: undefined
+    },
+    attributes: clone(Dataviz.defaults),
+    defaults: clone(Dataviz.defaults),
+    el: undefined,
+    loader: { library: "keen-io", chartType: "spinner" }
+  };
+  Dataviz.visuals.push(this);
+};
+
+extend(Dataviz, {
+  dataTypeMap: {
+    "singular":          { library: "keen-io", chartType: "metric"      },
+    "categorical":       { library: "google",  chartType: "piechart"    },
+    "cat-interval":      { library: "google",  chartType: "columnchart" },
+    "cat-ordinal":       { library: "google",  chartType: "barchart"    },
+    "chronological":     { library: "google",  chartType: "areachart"   },
+    "cat-chronological": { library: "google",  chartType: "linechart"   },
+    "extraction":        { library: "google",  chartType: "table"       }
+  },
+  defaults: {
+    colors: [
+    /* teal      red        yellow     purple     orange     mint       blue       green      lavender */
+    "#00bbde", "#fe6672", "#eeb058", "#8a8ad6", "#ff855c", "#00cfbb", "#5a9eed", "#73d483", "#c879bb",
+    "#0099b6", "#d74d58", "#cb9141", "#6b6bb6", "#d86945", "#00aa99", "#4281c9", "#57b566", "#ac5c9e",
+    "#27cceb", "#ff818b", "#f6bf71", "#9b9be1", "#ff9b79", "#26dfcd", "#73aff4", "#87e096", "#d88bcb"
+    ],
+    indexBy: "timeframe.start"
+  },
+  dependencies: {
+    loading: 0,
+    loaded: 0,
+    urls: {}
+  },
+  libraries: {},
+  visuals: []
+});
+
+Emitter(Dataviz);
+Emitter(Dataviz.prototype);
+
+Dataviz.register = function(name, methods, config){
+  var self = this;
+  var loadHandler = function(st) {
+    st.loaded++;
+    if(st.loaded === st.loading) {
+      Keen.loaded = true;
+      Keen.trigger("ready");
+    }
+  };
+
+  Dataviz.libraries[name] = Dataviz.libraries[name] || {};
+
+  // Add method to library hash
+  each(methods, function(method, key){
+    Dataviz.libraries[name][key] = method;
+  });
+
+  // Set default capabilities hash
+  if (config && config.capabilities) {
+    Dataviz.libraries[name]._defaults = Dataviz.libraries[name]._defaults || {};
+    each(config.capabilities, function(typeSet, key){
+      // store somewhere in library
+      Dataviz.libraries[name]._defaults[key] = typeSet;
+    });
+  }
+
+  // For all dependencies
+  if (config && config.dependencies) {
+    each(config.dependencies, function (dependency, index, collection) {
+      var status = Dataviz.dependencies;
+      // If it doesn't exist in the current dependencies being loaded
+      if(!status.urls[dependency.url]) {
+        status.urls[dependency.url] = true;
+        status.loading++;
+        var method = dependency.type === "script" ? loadScript : loadStyle;
+
+        method(dependency.url, function() {
+          if(dependency.cb) {
+            dependency.cb.call(self, function() {
+              loadHandler(status);
+            });
+          } else {
+            loadHandler(status);
+          }
+        });
+      }
+    });
+  }
+};
+
+Dataviz.find = function(target){
+  if (!arguments.length) return Dataviz.visuals;
+  var el = target.nodeName ? target : document.querySelector(target),
+      match;
+
+  each(Dataviz.visuals, function(visual){
+    if (el == visual.el()){
+      match = visual;
+      return false;
+    }
+  });
+  if (match) return match;
+};
+
+module.exports = Dataviz;
diff --git a/src/dataviz/extensions/draw.js b/src/dataviz/extensions/draw.js
new file mode 100644
index 0000000..194dcba
--- /dev/null
+++ b/src/dataviz/extensions/draw.js
@@ -0,0 +1,43 @@
+var clone = require("../../core/utils/clone"),
+    extend = require("../../core/utils/extend"),
+    Dataviz = require("../dataviz"),
+    Request = require("../../core/request");
+
+module.exports = function(query, el, cfg) {
+  var DEFAULTS = clone(Dataviz.defaults),
+      visual = new Dataviz(),
+      request = new Request(this, [query]),
+      config = cfg ? clone(cfg) : {};
+
+  if (config.chartType) {
+    visual.chartType(config.chartType);
+    delete config.chartType;
+  }
+
+  if (config.library) {
+    visual.library(config.library);
+    delete config.library;
+  }
+
+  if (config.chartOptions) {
+    visual.chartOptions(config.chartOptions);
+    delete config.chartOptions;
+  }
+
+  visual
+    .attributes(extend(DEFAULTS, config))
+    .el(el)
+    .prepare();
+
+  request.refresh();
+  request.on("complete", function(){
+    visual
+      .parseRequest(this)
+      .render();
+  });
+  request.on("error", function(res){
+    visual.error(res.message);
+  });
+
+  return visual;
+};
diff --git a/src/dataviz/lib/actions/utils/getAdapterActions.js b/src/dataviz/helpers/getAdapterActions.js
similarity index 61%
rename from src/dataviz/lib/actions/utils/getAdapterActions.js
rename to src/dataviz/helpers/getAdapterActions.js
index 9440ab9..7a77528 100644
--- a/src/dataviz/lib/actions/utils/getAdapterActions.js
+++ b/src/dataviz/helpers/getAdapterActions.js
@@ -1,5 +1,8 @@
-function _getAdapterActions(){
-  var map = _extend({}, Keen.Dataviz.dataTypeMap),
+var Dataviz = require("../dataviz"),
+    extend = require("../../core/utils/extend")
+
+module.exports = function(){
+  var map = extend({}, Dataviz.dataTypeMap),
       dataType = this.dataType(),
       library = this.library(),
       chartType = this.chartType() || this.defaultChartType();
@@ -11,7 +14,7 @@ function _getAdapterActions(){
 
   // Use this library's default chartType for this dataType
   if (library && !chartType && dataType) {
-    chartType = Keen.Dataviz.libraries[library]._defaults[dataType][0];
+    chartType = Dataviz.libraries[library]._defaults[dataType][0];
   }
 
   // Still no luck?
@@ -20,5 +23,5 @@ function _getAdapterActions(){
   }
 
   // Return if found
-  return (library && chartType) ? Keen.Dataviz.libraries[library][chartType] : {};
-}
+  return (library && chartType) ? Dataviz.libraries[library][chartType] : {};
+};
diff --git a/src/dataviz/helpers/getDatasetSchemas.js b/src/dataviz/helpers/getDatasetSchemas.js
new file mode 100644
index 0000000..8f124f7
--- /dev/null
+++ b/src/dataviz/helpers/getDatasetSchemas.js
@@ -0,0 +1,20 @@
+var each = require("../../core/utils/each"),
+    Dataset = require("../../dataset");
+
+module.exports = {
+  "extraction": parseExtraction
+};
+
+function parseExtraction(req){
+  var data = (req.data instanceof Array ? req.data[0] : req.data),
+  names = req.queries[0].get("property_names") || [],
+  schema = { records: "result", select: true };
+  if (names) {
+    schema.select = [];
+    each(names, function(p){
+      schema.select.push({ path: p });
+    });
+  }
+
+  return new Dataset(data, schema);
+}
diff --git a/src/dataviz/helpers/getDefaultTitle.js b/src/dataviz/helpers/getDefaultTitle.js
new file mode 100644
index 0000000..a9e9b25
--- /dev/null
+++ b/src/dataviz/helpers/getDefaultTitle.js
@@ -0,0 +1,12 @@
+module.exports = function(req){
+  var analysis = req.queries[0].analysis.replace("_", " "),
+  collection = req.queries[0].get('event_collection'),
+  output;
+  output = analysis.replace( /\b./g, function(a){
+    return a.toUpperCase();
+  });
+  if (collection) {
+    output += ' - ' + collection;
+  }
+  return output;
+};
diff --git a/src/dataviz/helpers/getQueryDataType.js b/src/dataviz/helpers/getQueryDataType.js
new file mode 100644
index 0000000..d56bd56
--- /dev/null
+++ b/src/dataviz/helpers/getQueryDataType.js
@@ -0,0 +1,51 @@
+module.exports = function(query){
+  var isInterval = typeof query.params.interval === "string",
+  isGroupBy = typeof query.params.group_by === "string",
+  is2xGroupBy = query.params.group_by instanceof Array,
+  dataType;
+
+  // metric
+  if (!isGroupBy && !isInterval) {
+    dataType = 'singular';
+  }
+
+  // group_by, no interval
+  if (isGroupBy && !isInterval) {
+    dataType = 'categorical';
+  }
+
+  // interval, no group_by
+  if (isInterval && !isGroupBy) {
+    dataType = 'chronological';
+  }
+
+  // interval, group_by
+  if (isInterval && isGroupBy) {
+    dataType = 'cat-chronological';
+  }
+
+  // 2x group_by
+  // TODO: research possible dataType options
+  if (!isInterval && is2xGroupBy) {
+    dataType = 'categorical';
+  }
+
+  // interval, 2x group_by
+  // TODO: research possible dataType options
+  if (isInterval && is2xGroupBy) {
+    dataType = 'cat-chronological';
+  }
+
+  if (query.analysis === "funnel") {
+    dataType = 'cat-ordinal';
+  }
+
+  if (query.analysis === "extraction") {
+    dataType = 'extraction';
+  }
+  if (query.analysis === "select_unique") {
+    dataType = 'nominal';
+  }
+
+  return dataType;
+};
diff --git a/src/dataviz/index.js b/src/dataviz/index.js
index ee4919a..e5a95b9 100644
--- a/src/dataviz/index.js
+++ b/src/dataviz/index.js
@@ -1,137 +1,38 @@
-/*!
-  * ----------------
-  * Keen.Dataviz
-  * ----------------
-  */
-
-_extend(Keen.utils, {
-  prettyNumber: _prettyNumber,
-  loadScript: _loadScript,
-  loadStyle: _loadStyle
+var extend = require("../core/utils/extend"),
+    Dataviz = require("./dataviz");
+
+extend(Dataviz.prototype, {
+  "adapter"          : require("./lib/adapter"),
+  "attributes"       : require("./lib/attributes"),
+  "call"             : require("./lib/call"),
+  "chartOptions"     : require("./lib/chartOptions"),
+  "chartType"        : require("./lib/chartType"),
+  "colorMapping"     : require("./lib/colorMapping"),
+  "colors"           : require("./lib/colors"),
+  "data"             : require("./lib/data"),
+  "dataType"         : require("./lib/dataType"),
+  "defaultChartType" : require("./lib/defaultChartType"),
+  "el"               : require("./lib/el"),
+  "height"           : require("./lib/height"),
+  "indexBy"          : require("./lib/indexBy"),
+  "labelMapping"     : require("./lib/labelMapping"),
+  "labels"           : require("./lib/labels"),
+  "library"          : require("./lib/library"),
+  "parseRawData"     : require("./lib/parseRawData"),
+  "parseRequest"     : require("./lib/parseRequest"),
+  "prepare"          : require("./lib/prepare"),
+  "sortGroups"       : require("./lib/sortGroups"),
+  "sortIntervals"    : require("./lib/sortIntervals"),
+  "title"            : require("./lib/title"),
+  "width"            : require("./lib/width")
 });
 
-// Set flag for script loading
-Keen.loaded = false;
-
-// ------------------------------
-// Dataviz constructor
-// ------------------------------
-
-Keen.Dataviz = function(){
-  this.dataset = new Keen.Dataset();
-  this.view = {
-    _prepared: false,
-    _initialized: false,
-    _rendered: false,
-    _artifacts: { /* state bin */ },
-    adapter: {
-      library: undefined,
-      chartType: undefined,
-      defaultChartType: undefined,
-      dataType: undefined
-    },
-    attributes: JSON.parse(JSON.stringify(Keen.Dataviz.defaults)),
-    defaults: JSON.parse(JSON.stringify(Keen.Dataviz.defaults)),
-    el: undefined,
-    loader: { library: "keen-io", chartType: "spinner" }
-  };
-
-  Keen.Dataviz.visuals.push(this);
-};
-
-_extend(Keen.Dataviz.prototype, Events);
-_extend(Keen.Dataviz, {
-  dataTypeMap: {
-    "singular":          { library: "keen-io", chartType: "metric"      },
-    "categorical":       { library: "google",  chartType: "piechart"    },
-    "cat-interval":      { library: "google",  chartType: "columnchart" },
-    "cat-ordinal":       { library: "google",  chartType: "barchart"    },
-    "chronological":     { library: "google",  chartType: "areachart"   },
-    "cat-chronological": { library: "google",  chartType: "linechart"   },
-    "extraction":        { library: "google",  chartType: "table"       }
-  },
-  defaults: {
-    colors: [
-    /* teal      red        yellow     purple     orange     mint       blue       green      lavender */
-      "#00bbde", "#fe6672", "#eeb058", "#8a8ad6", "#ff855c", "#00cfbb", "#5a9eed", "#73d483", "#c879bb",
-      "#0099b6", "#d74d58", "#cb9141", "#6b6bb6", "#d86945", "#00aa99", "#4281c9", "#57b566", "#ac5c9e",
-      "#27cceb", "#ff818b", "#f6bf71", "#9b9be1", "#ff9b79", "#26dfcd", "#73aff4", "#87e096", "#d88bcb"
-    ],
-    indexBy: "timeframe.start"
-  },
-  dependencies: {
-    loading: 0,
-    loaded: 0,
-    urls: {}
-  },
-  libraries: {},
-  visuals: []
+extend(Dataviz.prototype, {
+  "destroy"          : require("./lib/actions/destroy"),
+  "error"            : require("./lib/actions/error"),
+  "initialize"       : require("./lib/actions/initialize"),
+  "render"           : require("./lib/actions/render"),
+  "update"           : require("./lib/actions/update")
 });
 
-// ------------------------------
-// Utility methods
-// ------------------------------
-
-Keen.Dataviz.register = function(name, methods, config){
-  var self = this;
-  var loadHandler = function(st) {
-    st.loaded++;
-    if(st.loaded === st.loading) {
-      Keen.loaded = true;
-      Keen.trigger('ready');
-    }
-  };
-  Keen.Dataviz.libraries[name] = Keen.Dataviz.libraries[name] || {};
-
-  // Add method to library hash
-  _each(methods, function(method, key){
-    Keen.Dataviz.libraries[name][key] = method;
-  });
-
-  // Set default capabilities hash
-  if (config && config.capabilities) {
-    Keen.Dataviz.libraries[name]._defaults = Keen.Dataviz.libraries[name]._defaults || {};
-    _each(config.capabilities, function(typeSet, key){
-      // store somewhere in library
-      Keen.Dataviz.libraries[name]._defaults[key] = typeSet;
-    });
-  }
-
-  // For all dependencies
-  if (config && config.dependencies) {
-    _each(config.dependencies, function (dependency, index, collection) {
-      var status = Keen.Dataviz.dependencies;
-      // If it doesn't exist in the current dependencies being loaded
-      if(!status.urls[dependency.url]) {
-        status.urls[dependency.url] = true;
-        status.loading++;
-        var method = dependency.type === 'script' ? _loadScript : _loadStyle;
-
-        method(dependency.url, function() {
-          if(dependency.cb) {
-            dependency.cb.call(self, function() {
-              loadHandler(status);
-            });
-          } else {
-            loadHandler(status);
-          }
-        });
-      }
-    }); // End each
-  }
-};
-
-Keen.Dataviz.find = function(target){
-  if (!arguments.length) return Keen.Dataviz.visuals;
-  var el = target.nodeName ? target : document.querySelector(target),
-      match;
-
-  _each(Keen.Dataviz.visuals, function(visual){
-    if (el == visual.el()){
-      match = visual;
-      return false;
-    }
-  });
-  if (match) return match;
-  //Keen.log("Visualization not found");
-};
+module.exports = Dataviz;
diff --git a/src/dataviz/lib/actions/destroy.js b/src/dataviz/lib/actions/destroy.js
index a82d69a..d205ba3 100644
--- a/src/dataviz/lib/actions/destroy.js
+++ b/src/dataviz/lib/actions/destroy.js
@@ -1,8 +1,14 @@
-Keen.Dataviz.prototype.destroy = function(){
-  var actions = _getAdapterActions.call(this);
-  if (actions.destroy) actions.destroy.apply(this, arguments);
+var getAdapterActions = require("../../helpers/getAdapterActions");
+
+module.exports = function(){
+  var actions = getAdapterActions.call(this);
+  if (actions.destroy) {
+    actions.destroy.apply(this, arguments);
+  }
   // clear rendered artifats, state bin
-  if (this.el()) this.el().innerHTML = "";
+  if (this.el()) {
+    this.el().innerHTML = "";
+  }
   this.view._prepared = false;
   this.view._initialized = false;
   this.view._rendered = false;
diff --git a/src/dataviz/lib/actions/error.js b/src/dataviz/lib/actions/error.js
index 97f83bc..7a3bac8 100644
--- a/src/dataviz/lib/actions/error.js
+++ b/src/dataviz/lib/actions/error.js
@@ -1,9 +1,12 @@
-Keen.Dataviz.prototype.error = function(){
-  var actions = _getAdapterActions.call(this);
+var getAdapterActions = require("../../helpers/getAdapterActions"),
+    Dataviz = require("../../dataviz");
+
+module.exports = function(){
+  var actions = getAdapterActions.call(this);
   if (actions['error']) {
     actions['error'].apply(this, arguments);
   } else {
-    Keen.Dataviz.libraries['keen-io']['error'].render.apply(this, arguments);
+    Dataviz.libraries['keen-io']['error'].render.apply(this, arguments);
   }
   return this;
 };
diff --git a/src/dataviz/lib/actions/initialize.js b/src/dataviz/lib/actions/initialize.js
index 923dd32..2be0808 100644
--- a/src/dataviz/lib/actions/initialize.js
+++ b/src/dataviz/lib/actions/initialize.js
@@ -1,6 +1,9 @@
-Keen.Dataviz.prototype.initialize = function(){
-  var actions = _getAdapterActions.call(this);
-  var loader = Keen.Dataviz.libraries[this.view.loader.library][this.view.loader.chartType];
+var getAdapterActions = require("../../helpers/getAdapterActions"),
+    Dataviz = require("../../dataviz");
+
+module.exports = function(){
+  var actions = getAdapterActions.call(this);
+  var loader = Dataviz.libraries[this.view.loader.library][this.view.loader.chartType];
   if (this.view._prepared) {
     if (loader.destroy) loader.destroy.apply(this, arguments);
   } else {
diff --git a/src/dataviz/lib/actions/render.js b/src/dataviz/lib/actions/render.js
index 30feae8..c9e6c83 100644
--- a/src/dataviz/lib/actions/render.js
+++ b/src/dataviz/lib/actions/render.js
@@ -1,6 +1,9 @@
-Keen.Dataviz.prototype.render = function(){
-  var actions = _getAdapterActions.call(this);
-  _applyPostProcessing.call(this);
+var getAdapterActions = require("../../helpers/getAdapterActions"),
+    applyTransforms = require("../../utils/applyTransforms");
+
+module.exports = function(){
+  var actions = getAdapterActions.call(this);
+  applyTransforms.call(this);
   if (!this.view._initialized) {
     this.initialize();
   }
diff --git a/src/dataviz/lib/actions/update.js b/src/dataviz/lib/actions/update.js
index 38cb8c3..86952b9 100644
--- a/src/dataviz/lib/actions/update.js
+++ b/src/dataviz/lib/actions/update.js
@@ -1,6 +1,9 @@
-Keen.Dataviz.prototype.update = function(){
-  var actions = _getAdapterActions.call(this);
-  _applyPostProcessing.call(this);
+var getAdapterActions = require("../../helpers/getAdapterActions"),
+    applyTransforms = require("../../utils/applyTransforms");
+
+module.exports = function(){
+  var actions = getAdapterActions.call(this);
+  applyTransforms.call(this);
   if (actions.update) {
     actions.update.apply(this, arguments);
   } else if (actions.render) {
diff --git a/src/dataviz/lib/actions/utils/applyPostProcessing.js b/src/dataviz/lib/actions/utils/applyPostProcessing.js
deleted file mode 100644
index 5ef4819..0000000
--- a/src/dataviz/lib/actions/utils/applyPostProcessing.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function _applyPostProcessing(){
-  this
-    .call(_runLabelMapping)
-    .call(_runLabelReplacement)
-    .call(_runSortGroups)
-    .call(_runSortIntervals)
-    .call(_runColorMapping);
-}
diff --git a/src/dataviz/lib/adapter.js b/src/dataviz/lib/adapter.js
index 55eb059..70faa8f 100644
--- a/src/dataviz/lib/adapter.js
+++ b/src/dataviz/lib/adapter.js
@@ -1,7 +1,9 @@
-Keen.Dataviz.prototype.adapter = function(obj){
+var each = require("../../core/utils/each");
+
+module.exports = function(obj){
   if (!arguments.length) return this.view.adapter;
   var self = this;
-  _each(obj, function(prop, key){
+  each(obj, function(prop, key){
     self.view.adapter[key] = (prop ? prop : null);
   });
   return this;
diff --git a/src/dataviz/lib/attributes.js b/src/dataviz/lib/attributes.js
index e134c2c..5dc4f53 100644
--- a/src/dataviz/lib/attributes.js
+++ b/src/dataviz/lib/attributes.js
@@ -1,11 +1,15 @@
-Keen.Dataviz.prototype.attributes = function(obj){
-  if (!arguments.length) return this.view.attributes;
+var each = require("../../core/utils/each");
+var chartOptions = require("./chartOptions");
+
+module.exports = function(obj){
+  if (!arguments.length) return this.view["attributes"];
   var self = this;
-  _each(obj, function(prop, key){
+  each(obj, function(prop, key){
     if (key === "chartOptions") {
-      self.chartOptions(prop);
+      chartOptions.call(self, prop);
+      // self.chartOptions(prop);
     } else {
-      self.view.attributes[key] = (prop ? prop : null);
+      self.view["attributes"][key] = (prop ? prop : null);
     }
   });
   return this;
diff --git a/src/dataviz/lib/call.js b/src/dataviz/lib/call.js
index 6b01923..d640b40 100644
--- a/src/dataviz/lib/call.js
+++ b/src/dataviz/lib/call.js
@@ -1,4 +1,4 @@
-Keen.Dataviz.prototype.call = function(fn){
+module.exports = function(fn){
   fn.call(this);
   return this;
 };
diff --git a/src/dataviz/lib/chartOptions.js b/src/dataviz/lib/chartOptions.js
index 4ed5d5f..8fc92b2 100644
--- a/src/dataviz/lib/chartOptions.js
+++ b/src/dataviz/lib/chartOptions.js
@@ -1,8 +1,10 @@
-Keen.Dataviz.prototype.chartOptions = function(obj){
+var each = require("../../core/utils/each");
+
+module.exports = function(obj){
   if (!arguments.length) return this.view.adapter.chartOptions;
   var self = this;
   self.view.adapter.chartOptions = self.view.adapter.chartOptions || {};
-  _each(obj, function(prop, key){
+  each(obj, function(prop, key){
     self.view.adapter.chartOptions[key] = (prop ? prop : null);
   });
   return this;
diff --git a/src/dataviz/lib/chartType.js b/src/dataviz/lib/chartType.js
index c659ed3..6114214 100644
--- a/src/dataviz/lib/chartType.js
+++ b/src/dataviz/lib/chartType.js
@@ -1,4 +1,4 @@
-Keen.Dataviz.prototype.chartType = function(str){
+module.exports = function(str){
   if (!arguments.length) return this.view.adapter.chartType;
   this.view.adapter.chartType = (str ? String(str) : null);
   return this;
diff --git a/src/dataviz/lib/colorMapping.js b/src/dataviz/lib/colorMapping.js
index 193c65d..18cc106 100644
--- a/src/dataviz/lib/colorMapping.js
+++ b/src/dataviz/lib/colorMapping.js
@@ -1,21 +1,23 @@
-Keen.Dataviz.prototype.colorMapping = function(obj){
-  if (!arguments.length) return this.view.attributes.colorMapping;
-  this.view.attributes.colorMapping = (obj ? obj : null);
-  _runColorMapping.call(this);
+var each = require("../../core/utils/each");
+
+module.exports = function(obj){
+  if (!arguments.length) return this.view["attributes"].colorMapping;
+  this.view["attributes"].colorMapping = (obj ? obj : null);
+  colorMapping.call(this);
   return this;
 };
 
-function _runColorMapping(){
+function colorMapping(){
   var self = this,
-      schema = this.dataset.schema,
-      data = this.dataset.output(),
-      colorSet = this.view.defaults.colors.slice(),
-      colorMap = this.colorMapping(),
-      dt = this.dataType() || "";
+  schema = this.dataset.schema,
+  data = this.dataset.output(),
+  colorSet = this.view.defaults.colors.slice(),
+  colorMap = this.colorMapping(),
+  dt = this.dataType() || "";
 
   if (colorMap) {
     if (dt.indexOf("chronological") > -1 || (schema.unpack && data[0].length > 2)) {
-      _each(data[0].slice(1), function(label, i){
+      each(data[0].slice(1), function(label, i){
         var color = colorMap[label];
         if (color && colorSet[i] !== color) {
           colorSet.splice(i, 0, color);
@@ -23,7 +25,7 @@ function _runColorMapping(){
       });
     }
     else {
-      _each(self.dataset.selectColumn(0).slice(1), function(label, i){
+      each(self.dataset.selectColumn(0).slice(1), function(label, i){
         var color = colorMap[label];
         if (color && colorSet[i] !== color) {
           colorSet.splice(i, 0, color);
diff --git a/src/dataviz/lib/colors.js b/src/dataviz/lib/colors.js
index 091f66e..54e4521 100644
--- a/src/dataviz/lib/colors.js
+++ b/src/dataviz/lib/colors.js
@@ -1,6 +1,6 @@
-Keen.Dataviz.prototype.colors = function(arr){
-  if (!arguments.length) return this.view.attributes.colors;
-  this.view.attributes.colors = (arr instanceof Array ? arr : null);
+module.exports = function(arr){
+  if (!arguments.length) return this.view["attributes"].colors;
+  this.view["attributes"].colors = (arr instanceof Array ? arr : null);
   this.view.defaults.colors = (arr instanceof Array ? arr : null);
   return this;
 };
diff --git a/src/dataviz/lib/data.js b/src/dataviz/lib/data.js
index 6417df8..0b9f8c6 100644
--- a/src/dataviz/lib/data.js
+++ b/src/dataviz/lib/data.js
@@ -1,8 +1,11 @@
-Keen.Dataviz.prototype.data = function(data){
+var Dataset = require("../../dataset"),
+    Request = require("../../core/request");
+
+module.exports = function(data){
   if (!arguments.length) return this.dataset.output();
-  if (data instanceof Keen.Dataset) {
+  if (data instanceof Dataset) {
     this.dataset = data;
-  } else if (data instanceof Keen.Request) {
+  } else if (data instanceof Request) {
     this.parseRequest(data);
   } else {
     this.parseRawData(data);
diff --git a/src/dataviz/lib/dataType.js b/src/dataviz/lib/dataType.js
index db12b1f..3369680 100644
--- a/src/dataviz/lib/dataType.js
+++ b/src/dataviz/lib/dataType.js
@@ -1,4 +1,4 @@
-Keen.Dataviz.prototype.dataType = function(str){
+module.exports = function(str){
   if (!arguments.length) return this.view.adapter.dataType;
   this.view.adapter.dataType = (str ? String(str) : null);
   return this;
diff --git a/src/dataviz/lib/defaultChartType.js b/src/dataviz/lib/defaultChartType.js
index 1b2acd6..5c238ee 100644
--- a/src/dataviz/lib/defaultChartType.js
+++ b/src/dataviz/lib/defaultChartType.js
@@ -1,4 +1,4 @@
-Keen.Dataviz.prototype.defaultChartType = function(str){
+module.exports = function(str){
   if (!arguments.length) return this.view.adapter.defaultChartType;
   this.view.adapter.defaultChartType = (str ? String(str) : null);
   return this;
diff --git a/src/dataviz/lib/el.js b/src/dataviz/lib/el.js
index c3fcecb..9202a6e 100644
--- a/src/dataviz/lib/el.js
+++ b/src/dataviz/lib/el.js
@@ -1,4 +1,4 @@
-Keen.Dataviz.prototype.el = function(el){
+module.exports = function(el){
   if (!arguments.length) return this.view.el;
   this.view.el = el;
   return this;
diff --git a/src/dataviz/lib/height.js b/src/dataviz/lib/height.js
index ba7d11d..4f8c1fe 100644
--- a/src/dataviz/lib/height.js
+++ b/src/dataviz/lib/height.js
@@ -1,5 +1,5 @@
-Keen.Dataviz.prototype.height = function(num){
-  if (!arguments.length) return this.view.attributes['height'];
-  this.view.attributes['height'] = (!isNaN(parseInt(num)) ? parseInt(num) : null);
+module.exports = function(num){
+  if (!arguments.length) return this.view["attributes"]["height"];
+  this.view["attributes"]["height"] = (!isNaN(parseInt(num)) ? parseInt(num) : null);
   return this;
 };
diff --git a/src/dataviz/lib/indexBy.js b/src/dataviz/lib/indexBy.js
index d4eb132..2be29dd 100644
--- a/src/dataviz/lib/indexBy.js
+++ b/src/dataviz/lib/indexBy.js
@@ -1,14 +1,18 @@
-Keen.Dataviz.prototype.indexBy = function(str){
-  if (!arguments.length) return this.view.attributes.indexBy;
-  this.view.attributes.indexBy = (str ? String(str) : Keen.Dataviz.defaults.indexBy);
-  _runIndexBy.call(this);
+var Dataset = require("../../dataset"),
+    Dataviz = require("../dataviz"),
+    each = require("../../core/utils/each");
+
+module.exports = function(str){
+  if (!arguments.length) return this.view["attributes"].indexBy;
+  this.view["attributes"].indexBy = (str ? String(str) : Dataviz.defaults.indexBy);
+  indexBy.call(this);
   return this;
 };
 
-function _runIndexBy(){
+function indexBy(){
   var self = this,
-      root = this.dataset.meta.schema || this.dataset.meta.unpack,
-      newOrder = this.indexBy().split(".").join(Keen.Dataset.defaults.delimeter);
+  root = this.dataset.meta.schema || this.dataset.meta.unpack,
+  newOrder = this.indexBy().split(".").join(Dataset.defaults.delimeter);
   // Replace in schema and re-run dataset.parse()
   each(root, function(def, i){
     // update 'select' configs
diff --git a/src/dataviz/lib/labelMapping.js b/src/dataviz/lib/labelMapping.js
index dae42b8..aa16dec 100644
--- a/src/dataviz/lib/labelMapping.js
+++ b/src/dataviz/lib/labelMapping.js
@@ -1,15 +1,17 @@
-Keen.Dataviz.prototype.labelMapping = function(obj){
-  if (!arguments.length) return this.view.attributes.labelMapping;
-  this.view.attributes.labelMapping = (obj ? obj : null);
-  _runLabelMapping.call(this);
+var each = require("../../core/utils/each");
+
+module.exports = function(obj){
+  if (!arguments.length) return this.view["attributes"].labelMapping;
+  this.view["attributes"].labelMapping = (obj ? obj : null);
+  applyLabelMapping.call(this);
   return this;
 };
 
-function _runLabelMapping(){
+function applyLabelMapping(){
   var self = this,
-      labelMap = this.labelMapping(),
-      schema = this.dataset.schema() || {},
-      dt = this.dataType() || "";
+  labelMap = this.labelMapping(),
+  schema = this.dataset.schema() || {},
+  dt = this.dataType() || "";
 
   if (labelMap) {
     if (dt.indexOf("chronological") > -1 || (schema.unpack && self.dataset.output()[0].length > 2)) {
diff --git a/src/dataviz/lib/labels.js b/src/dataviz/lib/labels.js
index 85a1206..5fd5beb 100644
--- a/src/dataviz/lib/labels.js
+++ b/src/dataviz/lib/labels.js
@@ -1,26 +1,28 @@
-Keen.Dataviz.prototype.labels = function(arr){
-  if (!arguments.length) return this.view.attributes.labels;
-  this.view.attributes.labels = (arr instanceof Array ? arr : null);
-  _runLabelReplacement.call(this);
+var each = require("../../core/utils/each");
+
+module.exports = function(arr){
+  if (!arguments.length) return this.view["attributes"].labels;
+  this.view["attributes"].labels = (arr instanceof Array ? arr : null);
+  labelReplacement.call(this);
   return this;
 };
 
-function _runLabelReplacement(){
+function labelReplacement(){
   var self = this,
-      labelSet = this.labels() || null,
-      schema = this.dataset.schema() || {},
-      data = this.dataset.output(),
-      dt = this.dataType() || "";
+  labelSet = this.labels() || null,
+  schema = this.dataset.schema() || {},
+  data = this.dataset.output(),
+  dt = this.dataType() || "";
 
   if (labelSet) {
     if (dt.indexOf("chronological") > -1 || (schema.unpack && data[0].length > 2)) {
-      _each(data[0], function(cell,i){
+      each(data[0], function(cell,i){
         if (i > 0 && labelSet[i-1]) {
           self.dataset.data.output[0][i] = labelSet[i-1];
         }
       });
     } else {
-      _each(data, function(row,i){
+      each(data, function(row,i){
         if (i > 0 && labelSet[i-1]) {
           self.dataset.data.output[i][0] = labelSet[i-1];
         }
diff --git a/src/dataviz/lib/library.js b/src/dataviz/lib/library.js
index 03aa92f..6a744ba 100644
--- a/src/dataviz/lib/library.js
+++ b/src/dataviz/lib/library.js
@@ -1,4 +1,4 @@
-Keen.Dataviz.prototype.library = function(str){
+module.exports = function(str){
   if (!arguments.length) return this.view.adapter.library;
   this.view.adapter.library = (str ? String(str) : null);
   return this;
diff --git a/src/dataviz/lib/parseRawData.js b/src/dataviz/lib/parseRawData.js
index 15cb191..b8f6f6c 100644
--- a/src/dataviz/lib/parseRawData.js
+++ b/src/dataviz/lib/parseRawData.js
@@ -1,9 +1,12 @@
-Keen.Dataviz.prototype.parseRawData = function(raw){
-  this.dataset = _parseRawData.call(this, raw);
+var Dataviz = require("../dataviz"),
+    Dataset = require("../../dataset");
+
+module.exports = function(raw){
+  this.dataset = parseRawData.call(this, raw);
   return this;
 };
 
-function _parseRawData(response){
+function parseRawData(response){
   var self = this,
       schema = {},
       indexBy,
@@ -14,8 +17,8 @@ function _parseRawData(response){
       dataType,
       dataset;
 
-  indexBy = self.indexBy() ? self.indexBy() : Keen.Dataviz.defaults.indexBy;
-  delimeter = Keen.Dataset.defaults.delimeter;
+  indexBy = self.indexBy() ? self.indexBy() : Dataviz.defaults.indexBy;
+  delimeter = Dataset.defaults.delimeter;
   indexTarget = indexBy.split(".").join(delimeter);
 
   labelSet = self.labels() || null;
@@ -24,7 +27,7 @@ function _parseRawData(response){
   // Metric
   // -------------------------------
   if (typeof response.result == "number"){
-    //return new Keen.Dataset(response, {
+    //return new Dataset(response, {
     dataType = "singular";
     schema = {
       records: "",
@@ -137,11 +140,11 @@ function _parseRawData(response){
 
   }
 
-  dataset = new Keen.Dataset(response, schema);
+  dataset = new Dataset(response, schema);
 
   // Post-process label mapping/replacement
-  _runLabelMapping.call(self);
-  _runLabelReplacement.call(self);
+  self.labelMapping(self.labelMapping());
+  self.labels(self.labels());
   self.dataType(dataType);
 
   return dataset;
diff --git a/src/dataviz/lib/parseRequest.js b/src/dataviz/lib/parseRequest.js
index 896babb..e8d6b46 100644
--- a/src/dataviz/lib/parseRequest.js
+++ b/src/dataviz/lib/parseRequest.js
@@ -1,109 +1,29 @@
-Keen.Dataviz.prototype.parseRequest = function(req){
-  this.dataset = _parseRequest.call(this, req);
-  // Update the default title every time
-  this.view.defaults.title = _getDefaultTitle.call(this, req);
-  // Update the active title if not set
-  if (!this.title()) this.title(this.view.defaults.title);
-  return this;
-};
-
-function _parseRequest(req){
-  var dataType = _getQueryDataType.call(this, req.queries[0]),
-      dataset;
-
-  /*
-    TODO: Handle multiple queries
-  */
-  // First-pass at dataType detection
-  this.dataType(dataType);
-  if (this.dataType() !== "extraction") {
-    // Run data thru raw parser
-    dataset = _parseRawData.call(this, (req.data instanceof Array ? req.data[0] : req.data));
-  } else {
-    // Requires manual parser
-    dataset = _parseExtraction.call(this, req);
-  }
-  return dataset;
-}
-
-function _parseExtraction(req){
-  var data = (req.data instanceof Array ? req.data[0] : req.data),
-      names = req.queries[0].get("property_names") || [],
-      schema = { records: "result", select: true };
-
-  if (names) {
-    schema.select = [];
-    _each(names, function(p){
-      schema.select.push({ path: p });
-    });
-  }
-
-  return new Keen.Dataset(data, schema);
-}
-
-// function _parse2xGroupBy(req){}
-
-// function _parseQueryData(query){}
-
-function _getDefaultTitle(req){
-  var analysis = req.queries[0].analysis.replace("_", " "),
-      collection = req.queries[0].get('event_collection'),
-      output;
-  output = analysis.replace( /\b./g, function(a){
-    return a.toUpperCase();
-  });
-  if (collection) { output += ' - ' + collection; }
-  return output;
-}
+var getDatasetSchemas = require("../helpers/getDatasetSchemas"),
+    getDefaultTitle = require("../helpers/getDefaultTitle"),
+    getQueryDataType = require("../helpers/getQueryDataType");
 
-function _getQueryDataType(query){
-  var isInterval = typeof query.params.interval === "string",
-      isGroupBy = typeof query.params.group_by === "string",
-      is2xGroupBy = query.params.group_by instanceof Array,
-      dataType;
+var Dataset = require("../../dataset"),
+    parseRawData = require("./parseRawData");
 
-  // metric
-  if (!isGroupBy && !isInterval) {
-    dataType = 'singular';
-  }
-
-  // group_by, no interval
-  if (isGroupBy && !isInterval) {
-    dataType = 'categorical';
-  }
-
-  // interval, no group_by
-  if (isInterval && !isGroupBy) {
-    dataType = 'chronological';
-  }
+module.exports = function(req){
+  var dataType = getQueryDataType(req.queries[0]);
 
-  // interval, group_by
-  if (isInterval && isGroupBy) {
-    dataType = 'cat-chronological';
+  if (dataType === "extraction") {
+    this.dataset = getDatasetSchemas.extraction(req);
   }
-
-  // 2x group_by
-  // TODO: research possible dataType options
-  if (!isInterval && is2xGroupBy) {
-    dataType = 'categorical';
+  else {
+    this.parseRawData(req.data instanceof Array ? req.data[0] : req.data);
   }
 
-  // interval, 2x group_by
-  // TODO: research possible dataType options
-  if (isInterval && is2xGroupBy) {
-    dataType = 'cat-chronological';
-  }
+  // Set dataType
+  this.dataType(dataType);
 
-  if (query.analysis === "funnel") {
-    dataType = 'cat-ordinal';
-  }
+  // Update the default title every time
+  this.view.defaults.title = getDefaultTitle.call(this, req);
 
-  if (query.analysis === "extraction") {
-    dataType = 'extraction';
-  }
-  if (query.analysis === "select_unique") {
-    dataType = 'nominal';
+  // Update the active title if not set
+  if (!this.title()) {
+    this.title(this.view.defaults.title);
   }
-
-  return dataType;
-}
+  return this;
+};
diff --git a/src/dataviz/lib/prepare.js b/src/dataviz/lib/prepare.js
index 203f117..6f750ab 100644
--- a/src/dataviz/lib/prepare.js
+++ b/src/dataviz/lib/prepare.js
@@ -1,11 +1,13 @@
-Keen.Dataviz.prototype.prepare = function(){
+var Dataviz = require("../dataviz");
+
+module.exports = function(){
   var loader;
   if (this.view._rendered) {
     this.destroy();
   }
   if (this.el()) {
     this.el().innerHTML = "";
-    loader = Keen.Dataviz.libraries[this.view.loader.library][this.view.loader.chartType];
+    loader = Dataviz.libraries[this.view.loader.library][this.view.loader.chartType];
     if (loader.initialize) {
       loader.initialize.apply(this, arguments);
     }
diff --git a/src/dataviz/lib/sortGroups.js b/src/dataviz/lib/sortGroups.js
index 26a1856..03d87be 100644
--- a/src/dataviz/lib/sortGroups.js
+++ b/src/dataviz/lib/sortGroups.js
@@ -1,11 +1,11 @@
-Keen.Dataviz.prototype.sortGroups = function(str){
-  if (!arguments.length) return this.view.attributes.sortGroups;
-  this.view.attributes.sortGroups = (str ? String(str) : null);
-  _runSortGroups.call(this);
+module.exports = function(str){
+  if (!arguments.length) return this.view["attributes"].sortGroups;
+  this.view["attributes"].sortGroups = (str ? String(str) : null);
+  runSortGroups.call(this);
   return this;
 };
 
-function _runSortGroups(){
+function runSortGroups(){
   var dt = this.dataType();
   if (!this.sortGroups()) return;
   if ((dt && dt.indexOf("chronological") > -1) || this.data()[0].length > 2) {
diff --git a/src/dataviz/lib/sortIntervals.js b/src/dataviz/lib/sortIntervals.js
index 2c5e8c5..ec8aec1 100644
--- a/src/dataviz/lib/sortIntervals.js
+++ b/src/dataviz/lib/sortIntervals.js
@@ -1,11 +1,11 @@
-Keen.Dataviz.prototype.sortIntervals = function(str){
-  if (!arguments.length) return this.view.attributes.sortIntervals;
-  this.view.attributes.sortIntervals = (str ? String(str) : null);
-  _runSortIntervals.call(this);
+module.exports = function(str){
+  if (!arguments.length) return this.view["attributes"].sortIntervals;
+  this.view["attributes"].sortIntervals = (str ? String(str) : null);
+  runSortIntervals.call(this);
   return this;
 };
 
-function _runSortIntervals(){
+function runSortIntervals(){
   if (!this.sortIntervals()) return;
   // Sort rows by index
   this.dataset.sortRows(this.sortIntervals());
diff --git a/src/dataviz/lib/title.js b/src/dataviz/lib/title.js
index 2268a71..89bfcca 100644
--- a/src/dataviz/lib/title.js
+++ b/src/dataviz/lib/title.js
@@ -1,5 +1,5 @@
-Keen.Dataviz.prototype.title = function(str){
-  if (!arguments.length) return this.view.attributes.title;
-  this.view.attributes['title'] = (str ? String(str) : null);
+module.exports = function(str){
+  if (!arguments.length) return this.view["attributes"]["title"];
+  this.view["attributes"]["title"] = (str ? String(str) : null);
   return this;
 };
diff --git a/src/dataviz/lib/width.js b/src/dataviz/lib/width.js
index c9d3b18..bcf61ba 100644
--- a/src/dataviz/lib/width.js
+++ b/src/dataviz/lib/width.js
@@ -1,5 +1,5 @@
-Keen.Dataviz.prototype.width = function(num){
-  if (!arguments.length) return this.view.attributes['width'];
-  this.view.attributes['width'] = (!isNaN(parseInt(num)) ? parseInt(num) : null);
+module.exports = function(num){
+  if (!arguments.length) return this.view["attributes"]["width"];
+  this.view["attributes"]["width"] = (!isNaN(parseInt(num)) ? parseInt(num) : null);
   return this;
 };
diff --git a/src/dataviz/utils/applyTransforms.js b/src/dataviz/utils/applyTransforms.js
new file mode 100644
index 0000000..cf7fcdc
--- /dev/null
+++ b/src/dataviz/utils/applyTransforms.js
@@ -0,0 +1,7 @@
+module.exports = function(){
+  this
+    .labelMapping(this.labelMapping())
+    .labels(this.labels())
+    .sortGroups(this.sortGroups())
+    .sortIntervals(this.sortIntervals());
+};
diff --git a/src/dataviz/utils/loadScript.js b/src/dataviz/utils/loadScript.js
index e3aab55..3dff5ee 100644
--- a/src/dataviz/utils/loadScript.js
+++ b/src/dataviz/utils/loadScript.js
@@ -1,4 +1,4 @@
-function _loadScript(url, cb) {
+module.exports = function(url, cb) {
   var doc = document;
   var handler;
   var head = doc.head || doc.getElementsByTagName("head");
@@ -37,4 +37,4 @@ function _loadScript(url, cb) {
       doc.readyState = "complete";
     }, false);
   }
-}
+};
diff --git a/src/dataviz/utils/loadStyle.js b/src/dataviz/utils/loadStyle.js
index 4c50de2..42f18e4 100644
--- a/src/dataviz/utils/loadStyle.js
+++ b/src/dataviz/utils/loadStyle.js
@@ -1,8 +1,8 @@
-function _loadStyle(url, cb) {
+module.exports = function(url, cb) {
   var link = document.createElement('link');
   link.setAttribute('rel', 'stylesheet');
   link.type = 'text/css';
   link.href = url;
   cb();
   document.head.appendChild(link);
-}
+};
diff --git a/src/dataviz/utils/prettyNumber.js b/src/dataviz/utils/prettyNumber.js
index 05d0e26..846bb2b 100644
--- a/src/dataviz/utils/prettyNumber.js
+++ b/src/dataviz/utils/prettyNumber.js
@@ -1,4 +1,4 @@
-function _prettyNumber(_input) {
+module.exports = function(_input) {
   // If it has 3 or fewer sig figs already, just return the number.
   var input = Number(_input),
       sciNo = input.toPrecision(3),
@@ -63,4 +63,4 @@ function _prettyNumber(_input) {
       return recurse(Number(input) / 1000, iteration + 1);
     }
   }
-}
+};
diff --git a/src/keen-tracker.js b/src/keen-tracker.js
new file mode 100644
index 0000000..e71d039
--- /dev/null
+++ b/src/keen-tracker.js
@@ -0,0 +1,30 @@
+"use strict";
+
+var Keen = require("./core"),
+    extend = require("./core/utils/extend");
+
+extend(Keen.prototype, {
+  "addEvent"            : require("./core/lib/addEvent"),
+  "addEvents"           : require("./core/lib/addEvents"),
+  "setGlobalProperties" : require("./core/lib/setGlobalProperties"),
+  "trackExternalLink"   : require("./core/lib/trackExternalLink")
+});
+
+Keen.Base64 = require("./core/utils/base64");
+Keen.utils = {
+  "domready"     : require("domready"),
+  "each"         : require("./core/utils/each"),
+  "extend"       : extend,
+  "parseParams"  : require("./core/utils/parseParams")
+};
+
+if (Keen.loaded) {
+  setTimeout(function(){
+    Keen.utils.domready(function(){
+      Keen.emit("ready");
+    });
+  }, 0);
+}
+require("./core/async")();
+
+module.exports = Keen;
diff --git a/src/keen.js b/src/keen.js
new file mode 100644
index 0000000..34c0fe0
--- /dev/null
+++ b/src/keen.js
@@ -0,0 +1,50 @@
+"use strict";
+
+var Keen = require("./core"),
+    extend = require("./core/utils/extend");
+
+extend(Keen.prototype, {
+  "addEvent"            : require("./core/lib/addEvent"),
+  "addEvents"           : require("./core/lib/addEvents"),
+  "setGlobalProperties" : require("./core/lib/setGlobalProperties"),
+  "trackExternalLink"   : require("./core/lib/trackExternalLink"),
+  "get"                 : require("./core/lib/get"),
+  "post"                : require("./core/lib/post"),
+  "put"                 : require("./core/lib/post"),
+  "run"                 : require("./core/lib/run"),
+  "draw"                : require("./dataviz/extensions/draw")
+});
+
+Keen.Query = require("./core/query");
+Keen.Request = require("./core/request");
+Keen.Dataset = require("./dataset");
+Keen.Dataviz = require("./dataviz");
+
+Keen.Base64 = require("./core/utils/base64");
+Keen.Spinner = require("spin.js");
+
+Keen.utils = {
+  "domready"     : require("domready"),
+  "each"         : require("./core/utils/each"),
+  "extend"       : extend,
+  "parseParams"  : require("./core/utils/parseParams"),
+  "prettyNumber" : require("./dataviz/utils/prettyNumber")
+  // "loadScript"   : require("./dataviz/utils/loadScript"),
+  // "loadStyle"    : require("./dataviz/utils/loadStyle")
+};
+
+require("./dataviz/adapters/keen-io")();
+require("./dataviz/adapters/google")();
+require("./dataviz/adapters/c3")();
+require("./dataviz/adapters/chartjs")();
+
+if (Keen.loaded) {
+  setTimeout(function(){
+    Keen.utils.domready(function(){
+      Keen.emit("ready");
+    });
+  }, 0);
+}
+require("./core/async")();
+
+module.exports = Keen;
diff --git a/src/loader.js b/src/loader.js
index 8f60ad3..d97b156 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -1,4 +1,4 @@
-(function(i,o){i("Keen","/3.1.0/keen.min.js",o);}(function(t,h,x){
+(function(i,o){i("Keen","/3.2.0/keen.min.js",o);}(function(t,h,x){
   // t = context
   // h = file
   // x = context
diff --git a/src/query.js b/src/query.js
deleted file mode 100644
index 0ed2e51..0000000
--- a/src/query.js
+++ /dev/null
@@ -1,272 +0,0 @@
-/*!
- * ----------------------
- * Keen.Query
- * ----------------------
- */
-
-  // -------------------------------
-  // Inject <client>.query Method
-  // -------------------------------
-
-  Keen.prototype.run = function(query, success, error) {
-    var queries = [],
-        successCallback = success,
-        errorCallback = error;
-
-    success = null;
-    error = null;
-
-    if (query instanceof Array) {
-      queries = query;
-    } else {
-      queries.push(query);
-    }
-    var req = new Keen.Request(this, queries, successCallback, errorCallback);
-    successCallback = errorCallback = null;
-    return req;
-  };
-
-
-  // -------------------------------
-  // Keen.Request
-  // -------------------------------
-
-  Keen.Request = function(instance, queries, success, error){
-    var successCallback = success,
-        errorCallback = error;
-
-    success = null;
-    error = null;
-
-    this.configure(instance, queries, successCallback, errorCallback);
-    successCallback = errorCallback = null;
-  };
-  _extend(Keen.Request.prototype, Events);
-
-  Keen.Request.prototype.configure = function(instance, queries, success, error){
-    this.instance = instance;
-    this.queries = queries;
-    this.data;
-
-    this.success = success;
-    success = null;
-
-    this.error = error;
-    error = null;
-
-    this.refresh();
-    return this;
-  };
-
-  Keen.Request.prototype.refresh = function(){
-
-    var self = this,
-        completions = 0,
-        response = [];
-
-    var handleSuccess = function(res, index){
-      response[index] = res;
-      self.queries[index].data = res;
-      self.queries[index].trigger("complete", self.queries[index].data);
-
-      // Increment completion count
-      completions++;
-      if (completions == self.queries.length) {
-
-        // Attach response/meta data to query
-        if (self.queries.length == 1) {
-          self.data = response[0];
-        } else {
-          self.data = response;
-        }
-
-        // Trigger completion event on query
-        self.trigger("complete", self.data);
-
-        // Fire callback
-        if (self.success) {
-          self.success(self.data);
-        }
-      }
-
-    };
-
-    var handleFailure = function(res, req){
-      var response, status;
-      if (res) {
-        response = JSON.parse(res.responseText);
-        status = res.status + " " + res.statusText;
-      } else {
-        response = {
-          message: "Your query could not be completed, and the exact error message could not be captured (limitation of JSONP requests)",
-          error_code: "JS SDK"
-        };
-        status = "Error";
-      }
-
-      self.trigger("error", response);
-      if (self.error) {
-        self.error(response);
-      }
-      Keen.log(status + " (" + response.error_code + "): " + response.message);
-    };
-
-    _each(self.queries, function(query, index){
-      var url;
-      var successSequencer = function(res){
-        handleSuccess(res, index);
-      };
-      var failureSequencer = function(res){
-        handleFailure(res, index);
-      };
-
-      if (query instanceof Keen.Query) {
-        url = self.instance.url("/projects/" + self.instance.projectId() + query.path);
-        _sendQuery.call(self.instance, url, query.params, successSequencer, failureSequencer);
-      }
-      else if ( Object.prototype.toString.call(query) === '[object String]' ) {
-        url = self.instance.url("/projects/" + self.instance.projectId() + "/saved_queries/" + encodeURIComponent(query) + "/result");
-        _sendQuery.call(self.instance, url, null, successSequencer, failureSequencer);
-      }
-      else {
-        var res = {
-          statusText: 'Bad Request',
-          responseText: { message: 'Error: Query ' + (+index+1) + ' of ' + self.queries.length + ' for project ' + self.instance.projectId() + ' is not a valid request' }
-        };
-        Keen.log(res.responseText.message);
-        Keen.log('Check out our JavaScript SDK Usage Guide for Data Analysis:');
-        Keen.log('https://keen.io/docs/clients/javascript/usage-guide/#analyze-and-visualize');
-        if (self.error) {
-          self.error(res.responseText.message);
-        }
-      }
-    });
-    return this;
-  };
-
-
-  // -------------------------------
-  // Keen.Query
-  // -------------------------------
-
-  Keen.Query = function(){
-    this.configure.apply(this, arguments);
-  };
-  _extend(Keen.Query.prototype, Events);
-
-  Keen.Query.prototype.configure = function(analysisType, params) {
-    this.analysis = analysisType;
-    this.path = '/queries/' + analysisType;
-
-    // Apply params w/ #set method
-    this.params = this.params || {};
-    this.set(params);
-
-    // Localize timezone if none is set
-    if (this.params.timezone === void 0) {
-      this.params.timezone = _getTimezoneOffset();
-    }
-    return this;
-  };
-
-  Keen.Query.prototype.get = function(attribute) {
-    var key = attribute;
-    if (key.match(new RegExp("[A-Z]"))) {
-      key = key.replace(/([A-Z])/g, function($1) { return "_"+$1.toLowerCase(); });
-    }
-    if (this.params) {
-      return this.params[key] || null;
-    }
-  };
-
-  Keen.Query.prototype.set = function(attributes) {
-    var self = this;
-    _each(attributes, function(v, k){
-      var key = k, value = v;
-      if (k.match(new RegExp("[A-Z]"))) {
-        key = k.replace(/([A-Z])/g, function($1) { return "_"+$1.toLowerCase(); });
-      }
-      self.params[key] = value;
-      if (value instanceof Array) {
-        _each(value, function(dv, index){
-          if (dv instanceof Array == false && typeof dv === "object") { //  _type(dv)==="Object"
-            _each(dv, function(deepValue, deepKey){
-              if (deepKey.match(new RegExp("[A-Z]"))) {
-                var _deepKey = deepKey.replace(/([A-Z])/g, function($1) { return "_"+$1.toLowerCase(); });
-                delete self.params[key][index][deepKey];
-                self.params[key][index][_deepKey] = deepValue;
-              }
-            });
-          }
-        });
-      }
-    });
-    return self;
-  };
-
-  Keen.Query.prototype.addFilter = function(property, operator, value) {
-    this.params.filters = this.params.filters || [];
-    this.params.filters.push({
-      "property_name": property,
-      "operator": operator,
-      "property_value": value
-    });
-    return this;
-  };
-
-
-  // Private
-  // --------------------------------
-
-  function _getTimezoneOffset(){
-    return new Date().getTimezoneOffset() * -60;
-  };
-
-  function _getQueryString(params){
-    var query = [];
-    for (var key in params) {
-      if (params[key]) {
-        var value = params[key];
-        if (Object.prototype.toString.call(value) !== '[object String]') {
-          value = JSON.stringify(value);
-        }
-        value = encodeURIComponent(value);
-        query.push(key + '=' + value);
-      }
-    }
-    return "&" + query.join('&');
-  };
-
-
-  function _sendQuery(url, params, success, error){
-    var urlBase = url,
-        urlQueryString = "",
-        reqType = this.config.requestType,
-        successCallback = success,
-        errorCallback = error;
-
-    success = null;
-    error = null;
-
-    if (urlBase.indexOf("extraction") > -1) {
-      // Extractions do not currently support JSONP
-      reqType = "xhr";
-    }
-    urlQueryString += "?api_key=" + this.readKey();
-    urlQueryString += _getQueryString.call(this, params);
-
-    if (reqType !== "xhr") {
-      if ( String(urlBase + urlQueryString).length < Keen.urlMaxLength ) {
-        _sendJsonp(urlBase + urlQueryString, null, successCallback, errorCallback);
-        return;
-      }
-    }
-
-    if (Keen.canXHR) {
-      _sendXhr("GET", urlBase + urlQueryString, null, null, successCallback, errorCallback);
-    } else {
-      Keen.log("Event not sent: URL length exceeds current browser limit, and XHR (POST) is not supported.");
-    }
-    successCallback = errorCallback = null;
-    return;
-  }
diff --git a/src/server/index.js b/src/server/index.js
new file mode 100644
index 0000000..0ea30e1
--- /dev/null
+++ b/src/server/index.js
@@ -0,0 +1,26 @@
+var Keen = require("../core"),
+    extend = require("../core/utils/extend");
+
+extend(Keen.prototype, {
+  "addEvent"            : require("../core/lib/addEvent"),
+  "addEvents"           : require("../core/lib/addEvents"),
+  "setGlobalProperties" : require("../core/lib/setGlobalProperties"),
+  "get"                 : require("./lib/get"),
+  "post"                : require("../core/lib/post"),
+  "put"                 : require("../core/lib/post"),
+  "del"                 : require("./lib/del"),
+  "run"                 : require("../core/lib/run")
+});
+
+Keen.Query = require("../core/query");
+Keen.Request = require("../core/request");
+Keen.Dataset = require("../dataset");
+
+Keen.utils = {
+  "each"            : require("../core/utils/each"),
+  "extend"          : extend,
+  "encryptScopedKey": require("./utils/encryptScopedKey"),
+  "decryptScopedKey": require("./utils/decryptScopedKey")
+};
+
+module.exports = Keen;
diff --git a/src/server/lib/del.js b/src/server/lib/del.js
new file mode 100644
index 0000000..1e7b46e
--- /dev/null
+++ b/src/server/lib/del.js
@@ -0,0 +1,12 @@
+var request = require('superagent'),
+    handleResponse = require('../../core/helpers/superagent-handle-response');
+
+module.exports = function(url, data, api_key, callback){
+  request
+    .del(url)
+    .set('Authorization', api_key)
+    .set('Content-Type', 'application/json')
+    .end(function(err, res) {
+      handleResponse(err, res, callback);
+    });
+};
diff --git a/src/server/lib/get.js b/src/server/lib/get.js
new file mode 100644
index 0000000..a8bb969
--- /dev/null
+++ b/src/server/lib/get.js
@@ -0,0 +1,12 @@
+var request = require('superagent'),
+    getQueryString = require('../../core/helpers/get-query-string'),
+    handleResponse = require('../../core/helpers/superagent-handle-response');
+
+module.exports = function(url, data, api_key, callback){
+  request
+    .get(url+getQueryString(data))
+    .set('Authorization', api_key)
+    .end(function(error, response){
+      handleResponse(error, response, callback);
+    });
+};
diff --git a/src/server/utils/decryptScopedKey.js b/src/server/utils/decryptScopedKey.js
new file mode 100644
index 0000000..4977f22
--- /dev/null
+++ b/src/server/utils/decryptScopedKey.js
@@ -0,0 +1,16 @@
+var crypto = require('crypto'),
+    JSON2 = require("JSON2");
+
+module.exports = function(apiKey, scopedKey) {
+  // key and iv must be 'binary' encoded strings or buffers.
+  var key = new Buffer(apiKey);
+  var iv = new Buffer(scopedKey.substring(0, 32), "hex");
+  var decipher = crypto.createDecipheriv("aes-256-cbc", key, iv);
+
+  var cipherText = new Buffer(scopedKey.substring(32, scopedKey.length), "hex");
+
+  var decoded = decipher.update(cipherText, "hex", "utf8");
+      decoded += decipher.final("utf8");
+
+  return JSON2.parse(decoded);
+};
diff --git a/src/server/utils/encryptScopedKey.js b/src/server/utils/encryptScopedKey.js
new file mode 100644
index 0000000..572ea6a
--- /dev/null
+++ b/src/server/utils/encryptScopedKey.js
@@ -0,0 +1,15 @@
+var crypto = require("crypto"),
+    JSON2 = require("JSON2");
+
+module.exports = function(apiKey, data) {
+  // key and iv must be 'binary' encoded strings or buffers.
+  var key = new Buffer(apiKey);
+  var iv = crypto.randomBytes(16);
+  var cipher = crypto.createCipheriv("aes-256-cbc", key, iv);
+
+  var output = iv.toString("hex");
+      output += cipher.update(JSON2.stringify(data), "utf8", "hex");
+      output += cipher.final("hex");
+
+  return output;
+};
diff --git a/src/utils/base64.js b/src/utils/base64.js
deleted file mode 100644
index 8c47af9..0000000
--- a/src/utils/base64.js
+++ /dev/null
@@ -1,52 +0,0 @@
-  /*!
-  * ----------------------------------------
-  * Keen IO Base64 Transcoding
-  * ----------------------------------------
-  */
-
-  Keen.Base64 = {
-    map: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
-    encode: function (n) {
-      "use strict";
-      var o = "", i = 0, m = this.map, i1, i2, i3, e1, e2, e3, e4;
-      n = this.utf8.encode(n);
-      while (i < n.length) {
-        i1 = n.charCodeAt(i++); i2 = n.charCodeAt(i++); i3 = n.charCodeAt(i++);
-        e1 = (i1 >> 2); e2 = (((i1 & 3) << 4) | (i2 >> 4)); e3 = (isNaN(i2) ? 64 : ((i2 & 15) << 2) | (i3 >> 6));
-        e4 = (isNaN(i2) || isNaN(i3)) ? 64 : i3 & 63;
-        o = o + m.charAt(e1) + m.charAt(e2) + m.charAt(e3) + m.charAt(e4);
-      } return o;
-    },
-    decode: function (n) {
-      "use strict";
-      var o = "", i = 0, m = this.map, cc = String.fromCharCode, e1, e2, e3, e4, c1, c2, c3;
-      n = n.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-      while (i < n.length) {
-        e1 = m.indexOf(n.charAt(i++)); e2 = m.indexOf(n.charAt(i++));
-        e3 = m.indexOf(n.charAt(i++)); e4 = m.indexOf(n.charAt(i++));
-        c1 = (e1 << 2) | (e2 >> 4); c2 = ((e2 & 15) << 4) | (e3 >> 2);
-        c3 = ((e3 & 3) << 6) | e4;
-        o = o + (cc(c1) + ((e3 != 64) ? cc(c2) : "")) + (((e4 != 64) ? cc(c3) : ""));
-      } return this.utf8.decode(o);
-    },
-    utf8: {
-      encode: function (n) {
-        "use strict";
-        var o = "", i = 0, cc = String.fromCharCode, c;
-        while (i < n.length) {
-          c = n.charCodeAt(i++); o = o + ((c < 128) ? cc(c) : ((c > 127) && (c < 2048)) ?
-          (cc((c >> 6) | 192) + cc((c & 63) | 128)) : (cc((c >> 12) | 224) + cc(((c >> 6) & 63) | 128) + cc((c & 63) | 128)));
-          } return o;
-      },
-      decode: function (n) {
-        "use strict";
-        var o = "", i = 0, cc = String.fromCharCode, c2, c;
-        while (i < n.length) {
-          c = n.charCodeAt(i);
-          o = o + ((c < 128) ? [cc(c), i++][0] : ((c > 191) && (c < 224)) ?
-          [cc(((c & 31) << 6) | ((c2 = n.charCodeAt(i + 1)) & 63)), (i += 2)][0] :
-          [cc(((c & 15) << 12) | (((c2 = n.charCodeAt(i + 1)) & 63) << 6) | ((c3 = n.charCodeAt(i + 2)) & 63)), (i += 3)][0]);
-        } return o;
-      }
-    }
-  };
diff --git a/src/utils/json2.js b/src/utils/json2.js
deleted file mode 100644
index e933d44..0000000
--- a/src/utils/json2.js
+++ /dev/null
@@ -1,273 +0,0 @@
-  /*! 
-  * --------------------------------------------
-  * JSON2.js
-  * https://github.com/douglascrockford/JSON-js
-  * --------------------------------------------
-  */
-
-  // Create a JSON object only if one does not already exist. We create the
-  // methods in a closure to avoid creating global variables.
-
-  if (typeof JSON !== 'object') {
-    JSON = {};
-  }
-
-  (function () {
-    'use strict';
-
-    function f(n) {
-      // Format integers to have at least two digits.
-      return n < 10 ? '0' + n : n;
-    };
-
-    if (typeof Date.prototype.toJSON !== 'function') {
-      Date.prototype.toJSON = function (key) {
-        return isFinite(this.valueOf())
-            ? this.getUTCFullYear()     + '-' +
-            f(this.getUTCMonth() + 1) + '-' +
-            f(this.getUTCDate())      + 'T' +
-            f(this.getUTCHours())     + ':' +
-            f(this.getUTCMinutes())   + ':' +
-            f(this.getUTCSeconds())   + 'Z'
-            : null;
-      };
-      String.prototype.toJSON =
-        Number.prototype.toJSON =
-          Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-          };
-    }
-
-    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-      escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-      gap,
-      indent,
-      meta = {  // table of character substitutions
-        '\b': '\\b',
-        '\t': '\\t',
-        '\n': '\\n',
-        '\f': '\\f',
-        '\r': '\\r',
-        '"' : '\\"',
-        '\\': '\\\\'
-      },
-      rep;
-
-    function quote(string) {
-      // If the string contains no control characters, no quote characters, and no
-      // backslash characters, then we can safely slap some quotes around it.
-      // Otherwise we must also replace the offending characters with safe escape
-      // sequences.
-      escapable.lastIndex = 0;
-      return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
-        var c = meta[a];
-        return typeof c === 'string'
-          ? c
-          : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-      }) + '"' : '"' + string + '"';
-    };
-
-    function str(key, holder) {
-      // Produce a string from holder[key].
-      var i, // The loop counter.
-          k, // The member key.
-          v, // The member value.
-          length,
-          mind = gap,
-          partial,
-          value = holder[key];
-
-      // If the value has a toJSON method, call it to obtain a replacement value.
-      if (value && typeof value === 'object' &&
-        typeof value.toJSON === 'function') {
-        value = value.toJSON(key);
-      }
-
-      // If we were called with a replacer function, then call the replacer to
-      // obtain a replacement value.
-      if (typeof rep === 'function') {
-        value = rep.call(holder, key, value);
-      }
-    
-      // What happens next depends on the value's type.
-      switch (typeof value) {
-        case 'string':
-          return quote(value);
-        case 'number':
-          // JSON numbers must be finite. Encode non-finite numbers as null.
-          return isFinite(value) ? String(value) : 'null';
-        case 'boolean':
-        case 'null':
-          // If the value is a boolean or null, convert it to a string. Note:
-          // typeof null does not produce 'null'. The case is included here in
-          // the remote chance that this gets fixed someday.
-          return String(value);
-        // If the type is 'object', we might be dealing with an object or an array or null.
-        case 'object':
-          // Due to a specification blunder in ECMAScript, typeof null is 'object',
-          // so watch out for that case.
-          if (!value) {
-            return 'null';
-          }
-          // Make an array to hold the partial results of stringifying this object value.
-          gap += indent;
-          partial = [];
-          // Is the value an array?
-          if (Object.prototype.toString.apply(value) === '[object Array]') {
-            // The value is an array. Stringify every element. Use null as a placeholder
-            // for non-JSON values.
-            length = value.length;
-            for (i = 0; i < length; i += 1) {
-              partial[i] = str(i, value) || 'null';
-            }
-            // Join all of the elements together, separated with commas, and wrap them in brackets.
-            v = partial.length === 0
-              ? '[]'
-              : gap
-              ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
-              : '[' + partial.join(',') + ']';
-            gap = mind;
-            return v;
-          }
-          // If the replacer is an array, use it to select the members to be stringified.
-          if (rep && typeof rep === 'object') {
-            length = rep.length;
-            for (i = 0; i < length; i += 1) {
-              if (typeof rep[i] === 'string') {
-                k = rep[i];
-                v = str(k, value);
-                if (v) {
-                  partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                }
-              }
-            }
-          } else {
-            // Otherwise, iterate through all of the keys in the object.
-            for (k in value) {
-              if (Object.prototype.hasOwnProperty.call(value, k)) {
-                v = str(k, value);
-                if (v) {
-                  partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                }
-              }
-            }
-          }
-          // Join all of the member texts together, separated with commas,
-          // and wrap them in braces.
-          v = partial.length === 0
-              ? '{}'
-              : gap
-              ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
-              : '{' + partial.join(',') + '}';
-          gap = mind;
-          return v;
-        }
-      }
-    
-      // If the JSON object does not yet have a stringify method, give it one.
-      if (typeof JSON.stringify !== 'function') {
-        JSON.stringify = function (value, replacer, space) {
-          // The stringify method takes a value and an optional replacer, and an optional
-          // space parameter, and returns a JSON text. The replacer can be a function
-          // that can replace values, or an array of strings that will select the keys.
-          // A default replacer method can be provided. Use of the space parameter can
-          // produce text that is more easily readable.
-          var i;
-          gap = '';
-          indent = '';
-
-          // If the space parameter is a number, make an indent string containing that
-          // many spaces.
-          if (typeof space === 'number') {
-            for (i = 0; i < space; i += 1) {
-              indent += ' ';
-            }
-            // If the space parameter is a string, it will be used as the indent string.
-          } else if (typeof space === 'string') {
-            indent = space;
-          }
-
-          // If there is a replacer, it must be a function or an array.
-          // Otherwise, throw an error.
-          rep = replacer;
-          if (replacer && typeof replacer !== 'function' && (typeof replacer !== 'object' || typeof replacer.length !== 'number')) {
-            throw new Error('JSON.stringify');
-          }
-        
-          // Make a fake root object containing our value under the key of ''.
-          // Return the result of stringifying the value.
-          return str('', {'': value});
-        };
-      }
-
-      // If the JSON object does not yet have a parse method, give it one.
-      if (typeof JSON.parse !== 'function') {
-        JSON.parse = function (text, reviver) {
-          // The parse method takes a text and an optional reviver function, and returns
-          // a JavaScript value if the text is a valid JSON text.
-          var j;
-          function walk(holder, key) {
-            // The walk method is used to recursively walk the resulting structure so
-            // that modifications can be made.
-            var k, v, value = holder[key];
-            if (value && typeof value === 'object') {
-              for (k in value) {
-                if (Object.prototype.hasOwnProperty.call(value, k)) {
-                  v = walk(value, k);
-                  if (v !== undefined) {
-                    value[k] = v;
-                  } else {
-                    delete value[k];
-                  }
-                }
-              }
-            }
-            return reviver.call(holder, key, value);
-          }
-
-          // Parsing happens in four stages. In the first stage, we replace certain
-          // Unicode characters with escape sequences. JavaScript handles many characters
-          // incorrectly, either silently deleting them, or treating them as line endings.
-          text = String(text);
-          cx.lastIndex = 0;
-          if (cx.test(text)) {
-            text = text.replace(cx, function (a) {
-              return '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            });
-          }
-
-          // In the second stage, we run the text against regular expressions that look
-          // for non-JSON patterns. We are especially concerned with '()' and 'new'
-          // because they can cause invocation, and '=' because it can cause mutation.
-          // But just to be safe, we want to reject all unexpected forms.
-
-          // We split the second stage into 4 regexp operations in order to work around
-          // crippling inefficiencies in IE's and Safari's regexp engines. First we
-          // replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-          // replace all simple value tokens with ']' characters. Third, we delete all
-          // open brackets that follow a colon or comma or that begin the text. Finally,
-          // we look to see that the remaining characters are only whitespace or ']' or
-          // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-          if (/^[\],:{}\s]*$/
-              .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-              .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-              .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-                // In the third stage we use the eval function to compile the text into a
-                // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-                // in JavaScript: it can begin a block or an object literal. We wrap the text
-                // in parens to eliminate the ambiguity.
-                j = eval('(' + text + ')');
-
-                // In the optional fourth stage, we recursively walk the new structure, passing
-                // each name/value pair to a reviver function for possible transformation.
-                return typeof reviver === 'function'
-                    ? walk({'': j}, '')
-                    : j;
-          }
-
-          // If the text is not JSON parseable, then a SyntaxError is thrown.
-          throw new SyntaxError('JSON.parse');
-      };
-    }
-  }());
\ No newline at end of file
diff --git a/src/utils/keen-domready.js b/src/utils/keen-domready.js
deleted file mode 100644
index b27873b..0000000
--- a/src/utils/keen-domready.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*!
-  * domready (c) Dustin Diaz 2012 - License MIT
-  * Modified header to work internally w/ Keen lib
-  */
-(function(root, factory) {
-  root.utils.domready = factory();
-}(Keen, function (ready) {
-
-  var fns = [], fn, f = false
-    , doc = document
-    , testEl = doc.documentElement
-    , hack = testEl.doScroll
-    , domContentLoaded = 'DOMContentLoaded'
-    , addEventListener = 'addEventListener'
-    , onreadystatechange = 'onreadystatechange'
-    , readyState = 'readyState'
-    , loadedRgx = hack ? /^loaded|^c/ : /^loaded|c/
-    , loaded = loadedRgx.test(doc[readyState])
-
-  function flush(f) {
-    loaded = 1
-    while (f = fns.shift()) f()
-  }
-
-  doc[addEventListener] && doc[addEventListener](domContentLoaded, fn = function () {
-    doc.removeEventListener(domContentLoaded, fn, f)
-    flush()
-  }, f)
-
-
-  hack && doc.attachEvent(onreadystatechange, fn = function () {
-    if (/^c/.test(doc[readyState])) {
-      doc.detachEvent(onreadystatechange, fn)
-      flush()
-    }
-  })
-
-  return (ready = hack ?
-    function (fn) {
-      self != top ?
-        loaded ? fn() : fns.push(fn) :
-        function () {
-          try {
-            testEl.doScroll('left')
-          } catch (e) {
-            return setTimeout(function() { ready(fn) }, 50)
-          }
-          fn()
-        }()
-    } :
-    function (fn) {
-      loaded ? fn() : fns.push(fn)
-    })
-}));
diff --git a/src/utils/keen-spinner.js b/src/utils/keen-spinner.js
deleted file mode 100644
index 68af8b0..0000000
--- a/src/utils/keen-spinner.js
+++ /dev/null
@@ -1,342 +0,0 @@
-/*!
- * Copyright (c) 2011-2014 Felix Gnass
- * Licensed under the MIT license
- * Modified header to work internally w/ Keen lib
- */
-(function(root, factory) {
-  root.Spinner = factory();
-}
-(Keen, function() {
-  "use strict";
-
-  var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
-    , animations = {} /* Animation rules keyed by their name */
-    , useCssAnimations /* Whether to use CSS animations or setTimeout */
-
-  /**
-   * Utility function to create elements. If no tag name is given,
-   * a DIV is created. Optionally properties can be passed.
-   */
-  function createEl(tag, prop) {
-    var el = document.createElement(tag || 'div')
-      , n
-
-    for(n in prop) el[n] = prop[n]
-    return el
-  }
-
-  /**
-   * Appends children and returns the parent.
-   */
-  function ins(parent /* child1, child2, ...*/) {
-    for (var i=1, n=arguments.length; i<n; i++)
-      parent.appendChild(arguments[i])
-
-    return parent
-  }
-
-  /**
-   * Insert a new stylesheet to hold the @keyframe or VML rules.
-   */
-  var sheet = (function() {
-    var el = createEl('style', {type : 'text/css'})
-    ins(document.getElementsByTagName('head')[0], el)
-    return el.sheet || el.styleSheet
-  }())
-
-  /**
-   * Creates an opacity keyframe animation rule and returns its name.
-   * Since most mobile Webkits have timing issues with animation-delay,
-   * we create separate rules for each line/segment.
-   */
-  function addAnimation(alpha, trail, i, lines) {
-    var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-')
-      , start = 0.01 + i/lines * 100
-      , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
-      , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
-      , pre = prefix && '-' + prefix + '-' || ''
-
-    if (!animations[name]) {
-      sheet.insertRule(
-        '@' + pre + 'keyframes ' + name + '{' +
-        '0%{opacity:' + z + '}' +
-        start + '%{opacity:' + alpha + '}' +
-        (start+0.01) + '%{opacity:1}' +
-        (start+trail) % 100 + '%{opacity:' + alpha + '}' +
-        '100%{opacity:' + z + '}' +
-        '}', sheet.cssRules.length)
-
-      animations[name] = 1
-    }
-
-    return name
-  }
-
-  /**
-   * Tries various vendor prefixes and returns the first supported property.
-   */
-  function vendor(el, prop) {
-    var s = el.style
-      , pp
-      , i
-
-    prop = prop.charAt(0).toUpperCase() + prop.slice(1)
-    for(i=0; i<prefixes.length; i++) {
-      pp = prefixes[i]+prop
-      if(s[pp] !== undefined) return pp
-    }
-    if(s[prop] !== undefined) return prop
-  }
-
-  /**
-   * Sets multiple style properties at once.
-   */
-  function css(el, prop) {
-    for (var n in prop)
-      el.style[vendor(el, n)||n] = prop[n]
-
-    return el
-  }
-
-  /**
-   * Fills in default values.
-   */
-  function merge(obj) {
-    for (var i=1; i < arguments.length; i++) {
-      var def = arguments[i]
-      for (var n in def)
-        if (obj[n] === undefined) obj[n] = def[n]
-    }
-    return obj
-  }
-
-  /**
-   * Returns the absolute page-offset of the given element.
-   */
-  function pos(el) {
-    var o = { x:el.offsetLeft, y:el.offsetTop }
-    while((el = el.offsetParent))
-      o.x+=el.offsetLeft, o.y+=el.offsetTop
-
-    return o
-  }
-
-  /**
-   * Returns the line color from the given string or array.
-   */
-  function getColor(color, idx) {
-    return typeof color == 'string' ? color : color[idx % color.length]
-  }
-
-  // Built-in defaults
-
-  var defaults = {
-    lines: 12,            // The number of lines to draw
-    length: 7,            // The length of each line
-    width: 5,             // The line thickness
-    radius: 10,           // The radius of the inner circle
-    rotate: 0,            // Rotation offset
-    corners: 1,           // Roundness (0..1)
-    color: '#000',        // #rgb or #rrggbb
-    direction: 1,         // 1: clockwise, -1: counterclockwise
-    speed: 1,             // Rounds per second
-    trail: 100,           // Afterglow percentage
-    opacity: 1/4,         // Opacity of the lines
-    fps: 20,              // Frames per second when using setTimeout()
-    zIndex: 2e9,          // Use a high z-index by default
-    className: 'spinner', // CSS class to assign to the element
-    top: '50%',           // center vertically
-    left: '50%',          // center horizontally
-    position: 'absolute'  // element position
-  }
-
-  /** The constructor */
-  function Spinner(o) {
-    this.opts = merge(o || {}, Spinner.defaults, defaults)
-  }
-
-  // Global defaults that override the built-ins:
-  Spinner.defaults = {}
-
-  merge(Spinner.prototype, {
-
-    /**
-     * Adds the spinner to the given target element. If this instance is already
-     * spinning, it is automatically removed from its previous target b calling
-     * stop() internally.
-     */
-    spin: function(target) {
-      this.stop()
-
-      var self = this
-        , o = self.opts
-        , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
-        , mid = o.radius+o.length+o.width
-
-      css(el, {
-        left: o.left,
-        top: o.top
-      })
-
-      if (target) {
-        target.insertBefore(el, target.firstChild||null)
-      }
-
-      el.setAttribute('role', 'progressbar')
-      self.lines(el, self.opts)
-
-      if (!useCssAnimations) {
-        // No CSS animation support, use setTimeout() instead
-        var i = 0
-          , start = (o.lines - 1) * (1 - o.direction) / 2
-          , alpha
-          , fps = o.fps
-          , f = fps/o.speed
-          , ostep = (1-o.opacity) / (f*o.trail / 100)
-          , astep = f/o.lines
-
-        ;(function anim() {
-          i++;
-          for (var j = 0; j < o.lines; j++) {
-            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
-
-            self.opacity(el, j * o.direction + start, alpha, o)
-          }
-          self.timeout = self.el && setTimeout(anim, ~~(1000/fps))
-        })()
-      }
-      return self
-    },
-
-    /**
-     * Stops and removes the Spinner.
-     */
-    stop: function() {
-      var el = this.el
-      if (el) {
-        clearTimeout(this.timeout)
-        if (el.parentNode) el.parentNode.removeChild(el)
-        this.el = undefined
-      }
-      return this
-    },
-
-    /**
-     * Internal method that draws the individual lines. Will be overwritten
-     * in VML fallback mode below.
-     */
-    lines: function(el, o) {
-      var i = 0
-        , start = (o.lines - 1) * (1 - o.direction) / 2
-        , seg
-
-      function fill(color, shadow) {
-        return css(createEl(), {
-          position: 'absolute',
-          width: (o.length+o.width) + 'px',
-          height: o.width + 'px',
-          background: color,
-          boxShadow: shadow,
-          transformOrigin: 'left',
-          transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
-          borderRadius: (o.corners * o.width>>1) + 'px'
-        })
-      }
-
-      for (; i < o.lines; i++) {
-        seg = css(createEl(), {
-          position: 'absolute',
-          top: 1+~(o.width/2) + 'px',
-          transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
-          opacity: o.opacity,
-          animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
-        })
-
-        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
-        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
-      }
-      return el
-    },
-
-    /**
-     * Internal method that adjusts the opacity of a single line.
-     * Will be overwritten in VML fallback mode below.
-     */
-    opacity: function(el, i, val) {
-      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
-    }
-
-  })
-
-
-  function initVML() {
-
-    /* Utility function to create a VML tag */
-    function vml(tag, attr) {
-      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
-    }
-
-    // No CSS transforms but VML support, add a CSS rule for VML elements:
-    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
-
-    Spinner.prototype.lines = function(el, o) {
-      var r = o.length+o.width
-        , s = 2*r
-
-      function grp() {
-        return css(
-          vml('group', {
-            coordsize: s + ' ' + s,
-            coordorigin: -r + ' ' + -r
-          }),
-          { width: s, height: s }
-        )
-      }
-
-      var margin = -(o.width+o.length)*2 + 'px'
-        , g = css(grp(), {position: 'absolute', top: margin, left: margin})
-        , i
-
-      function seg(i, dx, filter) {
-        ins(g,
-          ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
-            ins(css(vml('roundrect', {arcsize: o.corners}), {
-                width: r,
-                height: o.width,
-                left: o.radius,
-                top: -o.width>>1,
-                filter: filter
-              }),
-              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
-              vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
-            )
-          )
-        )
-      }
-
-      if (o.shadow)
-        for (i = 1; i <= o.lines; i++)
-          seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
-
-      for (i = 1; i <= o.lines; i++) seg(i)
-      return ins(el, g)
-    }
-
-    Spinner.prototype.opacity = function(el, i, val, o) {
-      var c = el.firstChild
-      o = o.shadow && o.lines || 0
-      if (c && i+o < c.childNodes.length) {
-        c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild
-        if (c) c.opacity = val
-      }
-    }
-  }
-
-  var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
-
-  if (!vendor(probe, 'transform') && probe.adj) initVML()
-  else useCssAnimations = vendor(probe, 'animation')
-
-  return Spinner;
-
-}));
diff --git a/src/visualization.js b/src/visualization.js
deleted file mode 100644
index 0b59fc3..0000000
--- a/src/visualization.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/*!
- * ----------------------
- * Keen.Visualization
- * ----------------------
- */
-
-// ------------------------------
-// <Client>.draw method
-// ------------------------------
-// Shorthand interface, returns
-// a configured Dataviz instance
-// ------------------------------
-
-Keen.prototype.draw = function(query, el, cfg) {
-  var DEFAULTS = _clone(Keen.Visualization.defaults),
-      visual = new Keen.Dataviz(),
-      request = new Keen.Request(this, [query]),
-      config = cfg ? _clone(cfg) : {};
-
-  if (config.chartType) {
-    visual.chartType(config.chartType);
-    delete config.chartType;
-  }
-  if (config.library) {
-    visual.library(config.library);
-    delete config.library;
-  }
-  if (config.chartOptions) {
-    visual.chartOptions(config.chartOptions);
-    delete config.chartOptions;
-  }
-  visual
-    .attributes(_extend(DEFAULTS, config))
-    .el(el)
-    .prepare();
-
-  request.on("complete", function(){
-    visual
-      .parseRequest(this)
-      .render();
-  });
-  request.on("error", function(res){
-    visual.error(res.message);
-  });
-  return visual;
-};
-
-
-// ------------------------------
-// <Keen.Request>.draw method
-// ------------------------------
-// DEPRECATED: DO NOT USE :x
-// ------------------------------
-
-Keen.Request.prototype.draw = function(el, cfg) {
-  //Keen.log("DEPRECATED: \"<Keen.Request>.draw()\" will be removed in a future release.");
-  return new Keen.Visualization(this, el, cfg);
-};
-
-
-// ------------------------------
-// Visualization constructor
-// ------------------------------
-// Legacy interface, returns a
-// configured Dataviz instance
-// ------------------------------
-
-Keen.Visualization = function(dataset, el, cfg){
-  var DEFAULTS = _clone(Keen.Visualization.defaults),
-      visual = new Keen.Dataviz().data(dataset).el(el),
-      config = cfg ? _clone(cfg) : {};
-
-  if (config.chartType) {
-    visual.chartType(config.chartType);
-    delete config.chartType;
-  }
-  if (config.library) {
-    visual.library(config.library);
-    delete config.library;
-  }
-  if (config.chartOptions) {
-    visual.chartOptions(config.chartOptions);
-    delete config.chartOptions;
-  }
-  visual
-    .attributes(_extend(DEFAULTS, config))
-    .render();
-
-  return visual;
-};
-
-Keen.Visualization.defaults = _extend({
-  height: 400
-  //width: 600
-}, _clone(Keen.Dataviz.defaults));
diff --git a/src/wrappers/gulpTask.js b/src/wrappers/gulpTask.js
new file mode 100644
index 0000000..1edf068
--- /dev/null
+++ b/src/wrappers/gulpTask.js
@@ -0,0 +1,39 @@
+/*
+  Custom UMD template handling
+ */
+
+var es = require("event-stream"),
+    fs = require("fs"),
+    gutil = require("gulp-util"),
+    path = require("path"),
+    tpl = require("lodash.template");
+
+function wrap(template){
+  var template = fs.readFileSync( path.join(__dirname, template) );
+  return es.map(function(file, callback) {
+    build(file, template, callback);
+  });
+}
+
+function build(file, template, callback) {
+  var data = {};
+  data.file = file;
+  if (gutil.isStream(file.contents)) {
+    var through = es.through();
+    var wait = es.wait(function(err, contents) {
+      data.contents = contents;
+      // console.log(tpl(template, data))
+      through.write( tpl(template, data) );
+      through.end();
+    });
+    file.contents.pipe(wait);
+    file.contents = through;
+  }
+  if (gutil.isBuffer(file.contents)) {
+    data.contents = file.contents.toString();
+    file.contents = new Buffer(tpl(template, data));
+  }
+  callback(null, file);
+}
+
+module.exports = wrap;
diff --git a/src/wrappers/library.js b/src/wrappers/library.js
new file mode 100644
index 0000000..8ca226f
--- /dev/null
+++ b/src/wrappers/library.js
@@ -0,0 +1,25 @@
+;(function (f) {
+  // RequireJS
+  if (typeof define === "function" && define.amd) {
+    define("keen", [], function(){ return f(); });
+  }
+  // CommonJS
+  if (typeof exports === "object" && typeof module !== "undefined") {
+    module.exports = f();
+  }
+  // Global
+  var g = null;
+  if (typeof window !== "undefined") {
+    g = window;
+  } else if (typeof global !== "undefined") {
+    g = global;
+  } else if (typeof self !== "undefined") {
+    g = self;
+  }
+  if (g) {
+    g.Keen = f();
+  }
+})(function() {
+  <%= contents %>
+  return Keen;
+});
diff --git a/test/examples/dataviz/index.html b/test/examples/dataviz/index.html
index 0ce625f..1fb76a7 100644
--- a/test/examples/dataviz/index.html
+++ b/test/examples/dataviz/index.html
@@ -78,7 +78,7 @@ <h3>Metric</h3>
   .el(m3)
   .prepare();
 
-client.run(metric, function(res){
+client.run(metric, function(err, res){
   req_metric
     .parseRawData(res)
     .render();
@@ -312,12 +312,12 @@ <h4>Extractions</h4>
         .el(document.getElementById("1-3"))
         .prepare();
 
-      window.reqs['metric'].on("complete", function(res){
+      window.reqs['metric'].on("complete", function(err, res){
         //this.draw(document.getElementById("1-1"), { height: 138 });
         req_metric.parseRequest(this).render();
         raw_metric.parseRawData({ result: 3123 }).render();
       });
-      window.reqs['metric'].on("error", function(res){
+      window.reqs['metric'].on("error", function(err, res){
         req_metric.error(res.message);
         raw_metric.error(res.message);
       });
@@ -364,7 +364,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("2-3"))
         .prepare();
 
-      window.reqs['groupBy'].on("complete", function(res){
+      window.reqs['groupBy'].on("complete", function(err, res){
         req_pie
           .parseRequest(this)
           .sortGroups("desc")
@@ -374,7 +374,7 @@ <h4>Extractions</h4>
           .sortGroups("asc")
           .render();
       });
-      window.reqs['groupBy'].on("error", function(res){
+      window.reqs['groupBy'].on("error", function(err, res){
         req_pie.error(res.message);
         raw_pie.error(res.message);
       });
@@ -401,7 +401,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("3-3"))
         .prepare();
 
-      window.reqs['interval'].on("complete", function(res){
+      window.reqs['interval'].on("complete", function(err, res){
         req_area.parseRequest(this).render();
         raw_area.parseRawData(res)
         .render()
@@ -437,7 +437,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("4-3"))
         .prepare();
 
-      window.reqs['interval'].on("complete", function(res){
+      window.reqs['interval'].on("complete", function(err, res){
         req_bar.parseRequest(this).render();
         raw_bar.parseRawData(res).render();
       });
@@ -466,7 +466,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("5-3"))
         .prepare();
 
-      window.reqs['interval'].on("complete", function(res){
+      window.reqs['interval'].on("complete", function(err, res){
         req_col.parseRequest(this).render();
         raw_col.parseRawData(res).render();
       });
@@ -495,7 +495,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("6-3"))
         .prepare();
 
-      window.reqs['interval'].on("complete", function(res){
+      window.reqs['interval'].on("complete", function(err, res){
         req_line.parseRequest(this).render();
         raw_line.parseRawData(res).render();
       });
@@ -526,7 +526,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("7-3"))
         .prepare();
 
-      window.reqs['multiline'].on("complete", function(res){
+      window.reqs['multiline'].on("complete", function(err, res){
         req_mline.parseRequest(this).render();
         raw_mline.parseRawData(res).render();
       });
@@ -570,7 +570,7 @@ <h4>Extractions</h4>
         .el(document.getElementById("8-3"))
         .prepare();
 
-      window.reqs['multiline'].on("complete", function(res){
+      window.reqs['multiline'].on("complete", function(err, res){
         req_table.parseRequest(this).render();
         raw_table.parseRawData(res).render();
       });
@@ -578,7 +578,7 @@ <h4>Extractions</h4>
       var drawn_ext = client.draw(extraction, document.getElementById("9-1"), { height: 300 });
       var req_ext = new Keen.Dataviz().height(300).chartType("table").el(document.getElementById("9-2")).prepare();
       var raw_ext = new Keen.Dataviz().height(300).chartType("table").el(document.getElementById("9-3")).prepare();
-      window.reqs['extraction'].on("complete", function(res){
+      window.reqs['extraction'].on("complete", function(err, res){
         req_ext.parseRequest(this).render();
         raw_ext.parseRawData(res).render();
       });
diff --git a/test/examples/query/index.html b/test/examples/query/index.html
index 9793cb5..22b3bea 100644
--- a/test/examples/query/index.html
+++ b/test/examples/query/index.html
@@ -12,7 +12,7 @@
 			readKey: "4e4d72e5bf8b69686ed87a5a9671bba7ad829fbd10a1c281ee51b6e9c1ce9548e941e1f336f9de9281a5acc66ca8fdabc9b3c806e390eca01665f6a308a9b03d8b332b3fbd9f3cdfc3b3e16b0da6d84851e53fe20fbbce300801b8a401a6395b9f4ab9c89bff566e9678a74ca6624f9b"
 			// , protocol: "https"
 			// , host: 'analytics.yourdomain.com'
-			// , requestType: "xhr" // "jsonp" "beacon"
+			, requestType: "beacon" // "jsonp" "beacon"
 		});
 
 		/*
@@ -20,10 +20,10 @@
 		*/
 
 		var count = new Keen.Query("count", { eventCollection: "purchase" });
-    keen.run(count, function(res){
+    keen.run(count, function(err, res){
       console.log("single request", res);
     });
-    count.on('complete', function(res){
+    count.on('complete', function(err, res){
       console.log("query listener (count)", res);
     });
 
@@ -32,7 +32,7 @@
       eventCollection: "purchase",
 			targetProperty: 'amount'
 		});
-    keen.run(count_unique, function(res){
+    keen.run(count_unique, function(err, res){
       console.log("count_unique", res);
     });
 
@@ -41,7 +41,7 @@
       eventCollection: "purchase",
 			targetProperty: 'amount'
 		});
-    keen.run(sum, function(res){
+    keen.run(sum, function(err, res){
       console.log(res);
     });
 
@@ -50,7 +50,7 @@
       eventCollection: "purchase",
 			targetProperty: 'amount'
 		});
-    keen.run(max, function(res){
+    keen.run(max, function(err, res){
       console.log(res);
     });
 
@@ -59,7 +59,7 @@
       eventCollection: "purchase",
 			targetProperty: 'amount'
 		});
-    keen.run(min, function(res){
+    keen.run(min, function(err, res){
       console.log(res);
     });
 
@@ -68,7 +68,7 @@
       eventCollection: "purchase",
 			targetProperty: 'amount'
 		});
-    keen.run(avg, function(res){
+    keen.run(avg, function(err, res){
       console.log(res);
     });
 
@@ -77,13 +77,13 @@
       eventCollection: "purchase",
 			targetProperty: 'amount'
 		});
-    keen.run(select_unique, function(res){
+    keen.run(select_unique, function(err, res){
       console.log(res);
     });
 
 
 		var extraction = new Keen.Query('extraction', { eventCollection: "purchase" });
-    keen.run(extraction, function(res){
+    keen.run(extraction, function(err, res){
       console.log('EXTRACTION', res);
     });
 
@@ -91,7 +91,7 @@
 		// Nested queries
 		keen.run(max, function(response){
 			console.log('nested:max', response);
-			keen.run(min, function(res2){
+			keen.run(min, function(err, res2){
 				console.log('nested:min', res2);
 			});
 		});
@@ -105,7 +105,7 @@
 		// Add/remove event listeners
 		req.on('complete', reqDone);
 		req.off('complete', reqDone);
-		function reqDone(response){
+		function reqDone(err, response){
       console.log("THIS SHOULD NOT APPEAR");
     };
 		// Run .refresh() to execute again
@@ -113,7 +113,7 @@
 
 
 		// Multiple anonymous queries
-		keen.run([count, count_unique, sum, max, min, avg, select_unique, extraction], function(responses){
+		keen.run([count, count_unique, sum, max, min, avg, select_unique, extraction], function(err, responses){
 			console.log(responses.length + ' responses: ', responses);
 		});
 
@@ -169,16 +169,16 @@
 
 
 		// Multiple funnels
-		var funtimes = keen.run([funnel, fun2], function(response){
+		var funtimes = keen.run([funnel, fun2], function(err, response){
 			console.log("2 Funnels (callback)", response);
 		});
-    funtimes.on("complete", function(response){
+    funtimes.on("complete", function(err, response){
       console.log('2 Funnels (listener)', response);
     });
 
 		// Mock Error
 		setTimeout(function(){
-			keen.run({}, function(){}, function(error){
+			keen.run({}, function(error, res){
 				console.log('*Error Callback*', error);
 			});
 		}, 5000);
diff --git a/test/examples/script-loaders/require/app.js b/test/examples/script-loaders/require/app.js
index a5bd078..f4c613b 100644
--- a/test/examples/script-loaders/require/app.js
+++ b/test/examples/script-loaders/require/app.js
@@ -6,9 +6,9 @@ requirejs.config({
 
 require([
     "keen",
-    "../../../dist/adapters/keen-adapter-c3",
-     "../../../dist/adapters/keen-adapter-google",
-     "../../../dist/adapters/keen-adapter-chartjs"
+    // "../../../dist/adapters/keen-adapter-c3",
+    //  "../../../dist/adapters/keen-adapter-google",
+    //  "../../../dist/adapters/keen-adapter-chartjs"
   ], function(KeenAMD) {
 
   console.log(arguments);
diff --git a/test/examples/track/index.html b/test/examples/track/index.html
index a5075e9..569b163 100644
--- a/test/examples/track/index.html
+++ b/test/examples/track/index.html
@@ -2,9 +2,8 @@
 <html>
 <head>
   <title>Keen IO Query JS Test</title>
-
-  <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.0/jquery.min.js"></script>
-  <script src="../../dist/keen-tracker.js"></script>
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.js" type="text/javascript"></script>
+  <script src="../../dist/keen-tracker.js" type="text/javascript"></script>
 
   <script>
 
@@ -13,10 +12,12 @@
 			writeKey: "554a723d023da6cb24e51c56a9a54555e9dcf8403d4b71ffa37e9112295622e78a10eed43a13c83b14ce171b0f1317bb09aa8df43d50f73b77709ab431af611ea47ed65f4d74c0ea5f2bde8407322ab70559afef294673ee6c224308b1744c9e069508799edefc51264b3f75a1ba9e26"
 			//, protocol: "https"
 			//, host: 'analytics.yourdomain.com'
-			, requestType: "beacon"
+			, requestType: "jsonp"
 		});
 
-    client.addEvent('pageview', {page:'this one'});
+    client.addEvent('pageview', { page:'this one' }, function(err, res){
+      console.log('HERE ', err, res);
+    });
 
 		/*
 		client.addEvent('pageview', {page:'this one'});
@@ -27,6 +28,7 @@
 		client.addEvent('purchase', {amount: 1231.12});
 		client.addEvent('purchase', {amount: 544.43});
 		*/
+
     $(function(){
       // Links
       $("#a-ext").on("click", function(e){
@@ -84,5 +86,8 @@
     <input name="mode" type="text" value="Inline">
     <input type="submit" value="Submit">
   </form>
+
+  <br>
+  <a href="https://keen.io">Leaving...</a>
 </body>
 </html>
diff --git a/test/ie-legacy/async.html b/test/ie-legacy/async.html
deleted file mode 100644
index 598f786..0000000
--- a/test/ie-legacy/async.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <title>Keen IO JS | Asynchronous IE Legacy Test</title>
-
-	<!-- Initialize -->
-	<script>
-
-		!function(a,b){if(void 0===b[a]){b["_"+a]={},b[a]=function(c){b["_"+a].clients=b["_"+a].clients||{},b["_"+a].clients[c.projectId]=this,this._config=c},b[a].ready=function(c){b["_"+a].ready=b["_"+a].ready||[],b["_"+a].ready.push(c)};for(var c=["addEvent","setGlobalProperties","trackExternalLink","on"],d=0;d<c.length;d++){var e=c[d],f=function(a){return function(){return this["_"+a]=this["_"+a]||[],this["_"+a].push(arguments),this}};b[a].prototype[e]=f(e)}var g=document.createElement("script");g.type="text/javascript",g.async=!0,g.src="../dist/keen.js";var h=document.getElementsByTagName("script")[0];h.parentNode.insertBefore(g,h)}}("Keen",this);
-
-		var keen = new Keen({
-			projectId: '',
-			writeKey: '',
-			requestType: 'beacon'
-		});
-
-		var useragent = navigator.userAgent.toLowerCase();
-		var version = (useragent.indexOf('msie') != -1) ? parseInt(useragent.split('msie')[1]) : false;
-
-		keen.addEvent('explorer', { version: version, mode: 'async', type: 'beacon' });
-
-	</script>
-</head>
-<body></body>
-</html>
diff --git a/test/ie-legacy/index.html b/test/ie-legacy/index.html
deleted file mode 100644
index de4e736..0000000
--- a/test/ie-legacy/index.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <title>Keen IO JS | Synchronous IE Legacy Test</title>
-
-	<!-- File(s) to be tested -->
-	<script src="../dist/keen.js" type="text/javascript"></script>
-
-	<!-- Initialize -->
-	<script>
-
-		var keen = new Keen({
-			projectId: '',
-			writeKey: '',
-			requestType: 'beacon'
-		});
-
-		var useragent = navigator.userAgent.toLowerCase();
-		var version = (useragent.indexOf('msie') != -1) ? parseInt(useragent.split('msie')[1]) : false;
-
-		keen.addEvent('explorer', { version: version, mode: 'sync', type: 'beacon' });
-
-	</script>
-</head>
-<body></body>
-</html>
diff --git a/test/index.html b/test/index.html
deleted file mode 100644
index 006a68f..0000000
--- a/test/index.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" >
-  <title>Keen IO JS SDK Test</title>
-
-	<!-- Test Framework Assets -->
-	<link rel="stylesheet" href="./assets/mocha/mocha.css" />
-	<script src="./assets/mocha/mocha.js"></script>
-	<script src="./assets/chai/chai.js"></script>
-	<script src="./assets/sinon/index.js"></script>
-	<script src="./assets/sinon-ie/index.js"></script>
-
-  <!-- Test under presence of RequireJS -->
-  <script src="./assets/requirejs-bower/require.js"></script>
-
-	<!-- File(s) to be tested -->
-	<script src="./dist/keen.js"></script>
-
-	<!-- Setup -->
-	<script>mocha.setup('bdd')</script>
-	<script src="./keen-helper.js"></script>
-
-	<!-- Load Tests -->
-	<script src="./keen-unit-all.js"></script>
-
-	<!-- Initialize -->
-	<script>
-		var init = function(){
-
-			var runner = mocha.run();
-
-			var failedTests = [];
-			runner.on('end', function(){
-				window.mochaResults = runner.stats;
-				window.mochaResults.reports = failedTests;
-			});
-
-			runner.on('fail', logFailure);
-
-			function logFailure(test, err){
-
-				var flattenTitles = function(test){
-					var titles = [];
-					while (test.parent.title){
-						titles.push(test.parent.title);
-						test = test.parent;
-					}
-					return titles.reverse();
-				};
-
-				failedTests.push({name: test.title, result: false, message: err.message, stack: err.stack, titles: flattenTitles(test) });
-			};
-		};
-
-		if ( window.addEventListener ) {
-			window.addEventListener( "load", init, false );
-		}
-		else if ( window.attachEvent ) {
-			window.attachEvent( "onload", init );
-		} else if ( window.onLoad ) {
-			window.onload = init;
-		}
-
-	</script>
-</head>
-<body>
-	<div id="mocha"></div>
-  <div id="chart-test"></div>
-</body>
-</html>
diff --git a/test/keen-helper.js b/test/keen-helper.js
deleted file mode 100644
index 5936e4e..0000000
--- a/test/keen-helper.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var expect = chai.expect;
-var keenHelper = {
-  projectId: '5235435645bf82348762',
-  writeKey: '43232342f234g234234',
-  readKey: '42352gkjhgj1g2424',
-  protocol: 'https',
-  host: 'mocha.keen.io/9999/3.0',
-  //host: 'api.keen.io/9999/3.0',
-  collection: 'mocha',
-  properties: { username: 'keenio', color: 'blue' },
-  responses: {
-    success: '{\"created\": true }',
-    error: '{\"error\": true }'
-  }
-};
-Keen.debug = true;
diff --git a/test/unit/core.js b/test/unit/core.js
deleted file mode 100644
index c35683f..0000000
--- a/test/unit/core.js
+++ /dev/null
@@ -1,160 +0,0 @@
-describe("Keen (core)", function() {
-
-  beforeEach(function() {
-    this.project = new Keen({
-      projectId: keenHelper.projectId,
-      readKey: keenHelper.readKey,
-      writeKey: keenHelper.writeKey
-    });
-  });
-
-  describe("constructor", function(){
-    it("should create a new Keen instance", function(){
-      expect(this.project).to.be.an.instanceof(Keen);
-    });
-    it("should create a new config object", function(){
-      expect(this.project.config).to.be.ok;
-    });
-    it("should create a new config object when config argument is omitted", function(){
-      var empty = new Keen();
-      expect(empty.config).to.be.ok;
-    });
-  });
-
-  describe("projectId", function(){
-
-    it("should set the projectId (string)", function() {
-
-      expect(this.project.config)
-        .to.have.property('projectId')
-        .that.is.a('string')
-        .that.equals(keenHelper.projectId);
-
-    });
-
-  });
-
-  describe("readKey", function(){
-
-    it("should set the readKey (string)", function() {
-      expect(this.project.config)
-        .to.have.property('readKey')
-        .that.is.a('string')
-        .that.equals(keenHelper.readKey);
-
-    });
-
-  });
-
-  describe("writeKey", function(){
-
-    it("should set the writeKey (string)", function() {
-      expect(this.project.config)
-        .to.have.property('writeKey')
-        .that.is.a('string')
-        .that.equals(keenHelper.writeKey);
-
-    });
-
-  });
-
-  describe("protocol", function(){
-
-    it("should default to \"https\" if protocol is absent", function(){
-
-      // Empty
-      var keen_empty = new Keen({ projectId: '123' });
-      expect(keen_empty.config.protocol).to.equal('https');
-
-    });
-
-    it("should set protocol to \"https\" if designated", function(){
-
-      var keen = new Keen({ projectId: '123', protocol: 'https' });
-      expect(keen.config.protocol).to.equal('https');
-
-    });
-
-    it("should set protocol to \"http\" if designated", function(){
-
-      var keen = new Keen({ projectId: '123', protocol: 'http' });
-      expect(keen.config.protocol).to.equal('http');
-
-    });
-
-  });
-
-  describe("requestType", function(){
-
-    it("should set request type to \"jsonp\" by default", function(){
-
-      var keen = new Keen({ projectId: '123' });
-      expect(keen.config)
-        .to.have.property('requestType')
-        .that.is.a('string')
-        .that.equals('jsonp');
-
-      /*if ('withCredentials' in new XMLHttpRequest()) {
-        expect(keen.config)
-          .to.have.property('requestType')
-          .that.is.a('string')
-          .that.equals('xhr');
-      } else {
-        expect(keen.config)
-          .to.have.property('requestType')
-          .that.is.a('string')
-          .that.equals('jsonp');
-      }*/
-
-    });
-
-    it("should set request type to \"xhr\" if designated and CORS supported, otherwise fall back \"JSONP\"", function(){
-
-      var keen = new Keen({ projectId: '123', requestType: 'xhr' });
-      if ('withCredentials' in new XMLHttpRequest()) {
-        expect(keen.config)
-          .to.have.property('requestType')
-          .that.is.a('string')
-          .that.equals('xhr');
-      } else {
-        expect(keen.config)
-          .to.have.property('requestType')
-          .that.is.a('string')
-          .that.equals('jsonp');
-      }
-
-    });
-
-    it("should set request type to \"jsonp\" if designated", function(){
-
-      var keen = new Keen({ projectId: '123', requestType: 'jsonp' });
-      expect(keen.config)
-        .to.have.property('requestType')
-        .that.is.a('string')
-        .that.equals('jsonp');
-
-    });
-
-    it("should set request type to \"beacon\" if designated", function(){
-
-      var keen = new Keen({ projectId: '123', requestType: 'beacon' });
-      expect(keen.config)
-        .to.have.property('requestType')
-        .that.is.a('string')
-        .that.equals('beacon');
-
-    });
-
-  });
-
-  describe("Keen.urlMaxLength threshold", function(){
-    it("should be 2000 for IE, and 16000 otherwise", function(){
-      if (navigator.userAgent.indexOf('MSIE') !== -1 || navigator.appVersion.indexOf('Trident/') > 0) {
-        expect(Keen.urlMaxLength).to.eql(2000);
-      } else {
-        expect(Keen.urlMaxLength).to.eql(16000);
-      }
-    });
-  });
-
-});
diff --git a/test/unit/helpers/mockServerRequests.js b/test/unit/helpers/mockServerRequests.js
new file mode 100644
index 0000000..70d8e8b
--- /dev/null
+++ b/test/unit/helpers/mockServerRequests.js
@@ -0,0 +1,32 @@
+var nock = require('nock'),
+    keenHelper = require("./test-config");
+
+var baseUrl = "https://api.keen.io/3.0",
+    resHeader = { "Content-Type": "application/json" };
+
+module.exports = {
+  "post": mockPostRequest,
+  "get": mockGetRequest,
+  "del": mockDelRequest
+};
+
+function mockPostRequest(path, responseCode, responseBody, delay){
+  nock(baseUrl)
+    .post("/3.0/projects/" + keenHelper.projectId + path)
+    .delay(delay || 0)
+    .reply(responseCode, responseBody, resHeader);
+}
+
+function mockGetRequest(path, responseCode, responseBody, delay){
+  nock(baseUrl)
+    .get("/3.0/projects/" + keenHelper.projectId + path)
+    .delay(delay || 0)
+    .reply(responseCode, responseBody, resHeader);
+}
+
+function mockDelRequest(path, responseCode, responseBody, delay) {
+  nock(baseUrl)
+    .delete("/3.0/projects/" + keenHelper.projectId + path)
+    .delay(delay || 0)
+    .reply(responseCode, responseBody, resHeader);
+}
diff --git a/test/unit/helpers/test-config.js b/test/unit/helpers/test-config.js
new file mode 100644
index 0000000..3dd543b
--- /dev/null
+++ b/test/unit/helpers/test-config.js
@@ -0,0 +1,17 @@
+module.exports = {
+  projectId  : "52f00ec205cd66404b000000",
+  writeKey   : "554a723d023da6cb24e51c56a9a54555e9dcf8403d4b71ffa37e9112295622e78a10eed43a13c83b14ce171b0f1317bb09aa8df43d50f73b77709ab431af611ea47ed65f4d74c0ea5f2bde8407322ab70559afef294673ee6c224308b1744c9e069508799edefc51264b3f75a1ba9e26",
+  readKey    : "f979d53e026bdbf1ba16f01ce168bc7bcf9d5308ba672fb14e1834793a9e705eefa04793f0f87fb76b1d49a6cc2747b96a8abae0e4569d70314099b3f7790f55e98c9ac482e3883aab86a4bb577c295dbbca4867e95e2e4b15038fac5d80957ded3e868e4e6e319d3aa9275abc22b16e",
+  masterKey  : "FC135394DD08E3976870B7E7E83BDCD8",
+  protocol   : "https",
+  host       : "mocha.keen.io/9999/3.0",
+  collection : "mocha",
+  properties: {
+    username : "keenio",
+    color    : "blue"
+  },
+  responses: {
+    success  : '{\"created\": true }',
+    error    : '{\"error\": true }'
+  }
+};
diff --git a/test/unit/index.html b/test/unit/index.html
new file mode 100644
index 0000000..b3deda0
--- /dev/null
+++ b/test/unit/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" >
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Keen IO JavaScript SDK Unit Tests</title>
+  <link rel="stylesheet" href="../vendor/mocha/mocha.css" />
+</head>
+<body>
+	<div id="mocha"></div>
+  <div id="chart-test"></div>
+
+  <script src="../vendor/mocha/mocha.js"></script>
+  <script src="../vendor/sinon-1.12.1/index.js"></script>
+  <script>mocha.setup('bdd')</script>
+
+  <!-- Test under presence of RequireJS -->
+  <script src="../vendor/requirejs-bower/require.js"></script>
+  <script src="build/browserified-tests.js"></script>
+  <script>
+  if (window.mochaPhantomJS) {
+    mochaPhantomJS.run();
+  } else {
+    mocha.run();
+  }
+  </script>
+</body>
+</html>
diff --git a/test/unit/index.js b/test/unit/index.js
new file mode 100644
index 0000000..d648740
--- /dev/null
+++ b/test/unit/index.js
@@ -0,0 +1,14 @@
+// -------------------------
+// Common modules
+// -------------------------
+require("./modules/core/client-spec");
+require("./modules/core/events-spec");
+require("./modules/core/query-spec");
+require("./modules/dataset/dataset-spec");
+
+// -------------------------
+// Browser-specific modules
+// -------------------------
+require("./modules/core/tracker/browser-spec");
+require("./modules/core/request/browser-spec");
+require("./modules/dataviz/dataviz-spec");
diff --git a/test/unit/modules/core/client-spec.js b/test/unit/modules/core/client-spec.js
new file mode 100644
index 0000000..a231c6e
--- /dev/null
+++ b/test/unit/modules/core/client-spec.js
@@ -0,0 +1,129 @@
+var expect = require("chai").expect;
+
+var Keen = require("../../../../src/core"),
+    keenHelper = require("../../helpers/test-config");
+
+describe("Client", function() {
+
+  beforeEach(function() {
+    this.project = new Keen({
+      projectId  : keenHelper.projectId,
+      readKey    : keenHelper.readKey,
+      writeKey   : keenHelper.writeKey,
+      masterKey  : keenHelper.masterKey
+    });
+  });
+
+  describe("constructor", function(){
+    it("should create a new Keen instance", function(){
+      expect(this.project).to.be.an.instanceof(Keen);
+    });
+    it("should create a new config object", function(){
+      expect(this.project.config).to.be.ok;
+    });
+    it("should create a new config object when config argument is omitted", function(){
+      var empty = new Keen();
+      expect(empty.config).to.be.ok;
+    });
+  });
+
+  describe("#configure", function(){
+
+    describe("protocol", function(){
+      it("should default to \"https\" if protocol is absent", function(){
+        var keen_empty = new Keen({ projectId: '123' });
+        expect(keen_empty.config.protocol).to.equal('https');
+      });
+      it("should set protocol to \"https\" if designated", function(){
+        var keen = new Keen({ projectId: '123', protocol: 'https' });
+        expect(keen.config.protocol).to.equal('https');
+      });
+      it("should set protocol to \"http\" if designated", function(){
+        var keen = new Keen({ projectId: '123', protocol: 'http' });
+        expect(keen.config.protocol).to.equal('http');
+      });
+    });
+
+    describe("requestType", function(){
+      it("should set request type to \"jsonp\" by default", function(){
+        var keen = new Keen({ projectId: '123' });
+        expect(keen.config)
+        .to.have.property('requestType')
+        .that.is.a('string')
+        .that.equals('jsonp');
+      });
+      it("should set request type to \"jsonp\" if designated", function(){
+        var keen = new Keen({ projectId: '123', requestType: 'jsonp' });
+        expect(keen.config)
+        .to.have.property('requestType')
+        .that.is.a('string')
+        .that.equals('jsonp');
+      });
+      it("should set request type to \"beacon\" if designated", function(){
+        var keen = new Keen({ projectId: '123', requestType: 'beacon' });
+        expect(keen.config)
+        .to.have.property('requestType')
+        .that.is.a('string')
+        .that.equals('beacon');
+      });
+    });
+
+  });
+
+  describe("#projectId", function(){
+    it("should set the projectId (string)", function() {
+      expect(this.project.config)
+        .to.have.property('projectId')
+        .that.is.a('string')
+        .that.equals(keenHelper.projectId);
+    });
+    it("should remove the projectId by passing null", function(){
+      var client = new Keen({ projectId: "123" });
+      client.projectId(null);
+      expect(client.config.projectId).to.not.exist;
+    });
+  });
+
+  describe("#readKey", function(){
+    it("should set the readKey (string)", function() {
+      expect(this.project.config)
+        .to.have.property('readKey')
+        .that.is.a('string')
+        .that.equals(keenHelper.readKey);
+    });
+    it("should remove the readKey by passing null", function(){
+      var client = new Keen({ readKey: "123" });
+      client.readKey(null);
+      expect(client.config.readKey).to.not.exist;
+    });
+  });
+
+  describe("#writeKey", function(){
+    it("should set the writeKey (string)", function() {
+      expect(this.project.config)
+        .to.have.property('writeKey')
+        .that.is.a('string')
+        .that.equals(keenHelper.writeKey);
+    });
+    it("should remove the writeKey by passing null", function(){
+      var client = new Keen({ writeKey: "123" });
+      client.writeKey(null);
+      expect(client.config.writeKey).to.not.exist;
+    });
+  });
+
+  describe("#masterKey", function(){
+    it("should set the masterKey (string)", function() {
+      expect(this.project.config)
+      .to.have.property('masterKey')
+      .that.is.a('string')
+      .that.equals(keenHelper.masterKey);
+    });
+    it("should remove the masterKey by passing null", function(){
+      var client = new Keen({ masterKey: "123" });
+      client.masterKey(null);
+      expect(client.config.masterKey).to.not.exist;
+    });
+  });
+
+});
diff --git a/test/unit/modules/core/events-spec.js b/test/unit/modules/core/events-spec.js
new file mode 100644
index 0000000..3c339a7
--- /dev/null
+++ b/test/unit/modules/core/events-spec.js
@@ -0,0 +1,82 @@
+var chai = require("chai"),
+    expect = require("chai").expect,
+    spies = require("chai-spies");
+
+chai.use(spies);
+
+var Keen = require("../../../../src/core");
+
+describe("Keen.Events system", function(){
+
+  describe("#on", function(){
+    it("should attach custom event listeners with #on", function(){
+      Keen.on("whatever", chai.spy());
+      expect(Keen.listeners()).to.be.an("array");
+    });
+  });
+
+  describe("#trigger", function(){
+    it("should call bound functions when triggered", function(){
+      var callback = chai.spy();
+      Keen.on("whatever", callback);
+      Keen.trigger("whatever");
+      expect(callback).to.have.been.called.once;
+    });
+
+    it("should pass arguments to bound functions when triggered", function(){
+      var callback = chai.spy(),
+      payload = { status: "ok" };
+      Keen.on("whatever", callback);
+      Keen.trigger("whatever", payload);
+      expect(callback).to.have.been.called.once.with(payload);
+    });
+
+    it("should call bound functions multiple when triggered multiple times", function(){
+      var callback = chai.spy();
+      Keen.on("whatever", callback);
+      Keen.trigger("whatever");
+      Keen.trigger("whatever");
+      Keen.trigger("whatever");
+      expect(callback).to.have.been.called.exactly(3);
+    });
+  });
+
+  describe("#off", function(){
+    it("should remove all listeners for an event name with #off(name)", function(){
+      var callback = chai.spy();
+      Keen.on("whatever", callback);
+      Keen.on("whatever", callback);
+      Keen.off("whatever");
+      Keen.trigger("whatever");
+      expect(callback).to.not.have.been.called.once;
+    });
+
+    it("should remove specified listeners with #off(name, callback)", function(){
+      var callback = chai.spy(),
+      fakeback = function(){
+        throw Error("Don't call me!");
+      };
+      Keen.on("whatever", callback);
+      Keen.on("whatever", fakeback);
+      Keen.off("whatever", fakeback);
+      Keen.trigger("whatever");
+      expect(callback).to.have.been.called.once;
+    });
+  });
+
+  describe("#once", function() {
+    it("should call once handlers once when triggered", function(){
+      var query = Keen;
+      var callbackA = chai.spy();
+      var callbackB = chai.spy();
+      Keen.once('event', callbackA);
+      Keen.once('event', callbackB);
+      Keen.trigger('event');
+      expect(callbackA).to.have.been.called.once;
+      expect(callbackB).to.have.been.called.once;
+      Keen.trigger('event');
+      expect(callbackA).to.have.been.called.once;
+      expect(callbackB).to.have.been.called.once;
+    });
+  });
+});
diff --git a/test/unit/query.js b/test/unit/modules/core/query-spec.js
similarity index 55%
rename from test/unit/query.js
rename to test/unit/modules/core/query-spec.js
index 14b8b51..a11e398 100644
--- a/test/unit/query.js
+++ b/test/unit/modules/core/query-spec.js
@@ -1,3 +1,8 @@
+var expect = require("chai").expect;
+
+var Keen = require("../../../../src/core"),
+    keenHelper = require("../../helpers/test-config");
+
 describe("Keen.Query", function() {
 
   beforeEach(function() {
@@ -25,10 +30,6 @@ describe("Keen.Query", function() {
       expect(this.query).to.have.property("analysis").eql("count");
     });
 
-    it("should have a correct path propery", function(){
-      expect(this.query).to.have.property("path").eql("/queries/count");
-    });
-
     it("should have a params object", function(){
       expect(this.query).to.have.property("params");
     });
@@ -115,82 +116,6 @@ describe("Keen.Query", function() {
 
   });
 
-  describe("#on", function(){
-    it("should attach custom event listeners with #on", function(){
-      this.query.on("whatever", sinon.spy());
-      expect(this.query).to.have.property("listeners")
-        .that.is.an("object")
-        .that.has.property("whatever")
-        .that.is.an("array")
-        .with.deep.property('[0]')
-        .that.is.an("object")
-        .that.has.property("callback");
-    });
-  });
-
-  describe("#trigger", function(){
-    it("should call bound functions when triggered", function(){
-      var callback = sinon.spy();
-      this.query.on("whatever", callback);
-      this.query.trigger("whatever");
-      expect(callback.calledOnce).to.be.ok;
-    });
-
-    it("should pass arguments to bound functions when triggered", function(){
-      var callback = sinon.spy(),
-          payload = { status: "ok" };
-      this.query.on("whatever", callback);
-      this.query.trigger("whatever", payload);
-      expect(callback.calledWith(payload)).to.be.ok;
-    });
 
-    it("should call bound functions multiple when triggered multiple times", function(){
-      var callback = sinon.spy();
-      this.query.on("whatever", callback);
-      this.query.trigger("whatever");
-      this.query.trigger("whatever");
-      this.query.trigger("whatever");
-      expect(callback.callCount).to.eql(3);
-    });
-  });
-
-  describe("#off", function(){
-    it("should remove all listeners for an event name with #off(name)", function(){
-      var callback = sinon.spy();
-      this.query.on("whatever", callback);
-      this.query.on("whatever", callback);
-      this.query.off("whatever");
-      this.query.trigger("whatever");
-      expect(callback.callCount).to.eql(0);
-    });
-
-    it("should remove specified listeners with #off(name, callback)", function(){
-      var callback = sinon.spy(),
-          fakeback = function(){
-            throw Error("Don't call me!");
-          };
-      this.query.on("whatever", callback);
-      this.query.on("whatever", fakeback);
-      this.query.off("whatever", fakeback);
-      this.query.trigger("whatever");
-      expect(callback.callCount).to.eql(1);
-    });
-  });
-
-  describe("#once", function() {
-    it("should call once handlers once when triggered", function(){
-      var query = this.query;
-      var callbackA = sinon.spy();
-      var callbackB = sinon.spy();
-      this.query.once('event', callbackA);
-      this.query.once('event', callbackB);
-      this.query.trigger('event');
-      expect(callbackA.callCount).to.eql(1);
-      expect(callbackB.callCount).to.eql(1);
-      this.query.trigger('event');
-      expect(callbackA.callCount).to.eql(1);
-      expect(callbackB.callCount).to.eql(1);
-    });
-  });
 
 });
diff --git a/test/unit/modules/core/request/browser-spec.js b/test/unit/modules/core/request/browser-spec.js
new file mode 100644
index 0000000..abee028
--- /dev/null
+++ b/test/unit/modules/core/request/browser-spec.js
@@ -0,0 +1,104 @@
+/* globals: sinon */
+var expect = require("chai").expect,
+    JSON2 = require("JSON2");
+
+var Keen = require("../../../../../src/keen"),
+    keenHelper = require("../../../helpers/test-config");
+
+describe("Keen.Request", function() {
+
+  beforeEach(function() {
+    this.client = new Keen({
+      projectId: keenHelper.projectId,
+      readKey: keenHelper.readKey,
+      requestType: "xhr"
+    });
+    this.query = new Keen.Query("count", {
+      eventCollection: "test-collection"
+    });
+    this.postUrl = this.client.url("/queries/count");
+    this.server = sinon.fakeServer.create();
+  });
+
+  afterEach(function(){
+    this.client = void 0;
+    this.query = void 0;
+    this.server.restore();
+  });
+
+  describe("<Client>.run method", function(){
+
+    it("should be a method", function(){
+      expect(this.client.run).to.be.a("function");
+    });
+
+    it("should throw an error when passed an invalid object", function(){
+      var self = this;
+      expect(function(){ self.run(null); }).to.throw(Error);
+      expect(function(){ self.run({}); }).to.throw(Error);
+      expect(function(){ self.run(0); }).to.throw(Error);
+      expect(function(){ self.run("string"); }).to.throw(Error);
+    });
+
+    it("should return a response when successful", function(){
+      var response = { result: 1 };
+      this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, JSON2.stringify(response) ] );
+      this.server.respond();
+      this.client.run(this.query, function(err, res){
+        expect(err).to.be.a("null");
+        expect(res).to.deep.equal(response);
+      });
+    });
+
+    it("should return an error when unsuccessful", function(){
+      var response = { error_code: "ResourceNotFoundError", message: "no foo" };
+      this.server.respondWith( "POST", this.postUrl, [ 500, { "Content-Type": "application/json"}, JSON2.stringify(response) ] );
+      this.server.respond();
+      this.client.run(this.query, function(err, res){
+        expect(err).to.exist;
+        expect(err["code"]).to.equal(response.error_code);
+        expect(res).to.be.a("null");
+      });
+    });
+
+    it("should return an error when timed out", function(){
+      this.server.respondWith( "POST", this.postUrl, [ 500, { "Content-Type": "application/json"}, "" ] );
+      var req = new Keen.Request(this.client, [this.query], function(err, res){
+        expect(err).to.exist;
+        expect(err["message"]).to.equal("timeout of 1ms exceeded");
+        expect(res).to.be.a("null");
+      });
+      req
+        .timeout(1)
+        .refresh();
+    });
+
+    describe("Multiple queries", function(){
+      it("should return a single response when successful", function(){
+        var response = [{ result: 1 }, { result: 1 }, { result: 1 }];
+        this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, JSON2.stringify(response[0]) ] );
+        this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, JSON2.stringify(response[1]) ] );
+        this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, JSON2.stringify(response[2]) ] );
+        this.server.respond();
+        this.client.run([this.query, this.query, this.query], function(err, res){
+          expect(err).to.be.a("null");
+          expect(res).to.be.an("array").and.to.have.length(3);
+          expect(res).to.deep.equal(response);
+        });
+      });
+      it('should return a single error when unsuccessful', function(){
+        var response = { error_code: "ResourceNotFoundError", message: "no foo" };
+        this.server.respondWith( "POST", this.postUrl, [ 500, { "Content-Type": "application/json"}, JSON2.stringify(response) ] );
+        this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, JSON2.stringify({ result: 1 }) ] );
+        this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, JSON2.stringify({ result: 1 }) ] );
+        this.client.run([this.query, this.query, this.query], function(err, res){
+          expect(err).to.exist;
+          expect(err["code"]).to.equal(response.error_code);
+          expect(res).to.be.a("null");
+        });
+      });
+    });
+
+  });
+
+});
diff --git a/test/unit/modules/core/request/server-spec.js b/test/unit/modules/core/request/server-spec.js
new file mode 100644
index 0000000..887709f
--- /dev/null
+++ b/test/unit/modules/core/request/server-spec.js
@@ -0,0 +1,105 @@
+var chai = require("chai"),
+    expect = require("chai").expect,
+    JSON2 = require("JSON2"),
+    spies = require("chai-spies");
+
+chai.use(spies);
+
+var Keen = require("../../../../../src/server"),
+    keenHelper = require("../../../helpers/test-config"),
+    mock = require("../../../helpers/mockServerRequests");
+
+describe("Keen.Request", function() {
+
+  beforeEach(function() {
+    this.client = new Keen({
+      projectId: keenHelper.projectId,
+      readKey: keenHelper.readKey
+    });
+    this.query = new Keen.Query("count", {
+      eventCollection: "test-collection"
+    });
+  });
+
+  afterEach(function(){
+    this.client = void 0;
+    this.query = void 0;
+  });
+
+  describe("<Client>.run method", function(){
+
+    it("should be a method", function(){
+      expect(this.client.run).to.be.a("function");
+    });
+
+    it("should throw an error when passed an invalid object", function(){
+      var self = this;
+      expect(function(){ self.run(null); }).to.throw(Error);
+      expect(function(){ self.run({}); }).to.throw(Error);
+      expect(function(){ self.run(0); }).to.throw(Error);
+      expect(function(){ self.run("string"); }).to.throw(Error);
+    });
+
+    it("should return a response when successful", function(done){
+      var response = { result: 1 };
+      mock.post("/queries/count", 200, JSON2.stringify(response));
+      this.client.run(this.query, function(err, res){
+        expect(err).to.be.a("null");
+        expect(res).to.deep.equal(response);
+        done();
+      });
+    });
+
+    it("should return an error when unsuccessful", function(done){
+      var response = { error_code: "ResourceNotFoundError", message: "no foo" };
+      mock.post("/queries/count", 500, JSON2.stringify(response));
+      this.client.run(this.query, function(err, res){
+        expect(err).to.exist;
+        expect(err["code"]).to.equal(response.error_code);
+        expect(res).to.be.a("null");
+        done();
+      });
+    });
+
+    it("should return an error when timed out", function(){
+      mock.post("/queries/count", 500, '{ "timeout": 1, "message": "timeout of 1ms exceeded" }', 1000);
+      var req = new Keen.Request(this.client, [this.query], function(err, res){
+        expect(err).to.exist;
+        expect(err["message"]).to.equal("timeout of 1ms exceeded");
+        expect(res).to.be.a("null");
+      });
+      req
+        .timeout(1)
+        .refresh();
+    });
+
+    describe("Multiple queries", function(){
+      it("should return a single response when successful", function(done){
+        var response = [{ result: 1 }, { result: 1 }, { result: 1 }];
+        mock.post("/queries/count", 200, JSON2.stringify(response[0]));
+        mock.post("/queries/count", 200, JSON2.stringify(response[1]));
+        mock.post("/queries/count", 200, JSON2.stringify(response[2]));
+        this.client.run([this.query, this.query, this.query], function(err, res){
+          expect(err).to.be.a("null");
+          expect(res).to.be.an("array").and.to.have.length(3);
+          expect(res).to.deep.equal(response);
+          done();
+        });
+      });
+      it('should return a single error when unsuccessful', function(done){
+        var response = { error_code: "ResourceNotFoundError", message: "no foo" };
+        mock.post("/queries/count", 500, JSON2.stringify(response));
+        mock.post("/queries/count", 200, JSON2.stringify({ result: 1 }));
+        mock.post("/queries/count", 200, JSON2.stringify({ result: 1 }));
+        this.client.run([this.query, this.query, this.query], function(err, res){
+          expect(err).to.exist;
+          expect(err["code"]).to.equal(response.error_code);
+          expect(res).to.be.a("null");
+          done();
+        });
+      });
+    });
+
+  });
+
+});
diff --git a/test/unit/modules/core/tracker/browser-spec.js b/test/unit/modules/core/tracker/browser-spec.js
new file mode 100644
index 0000000..cb154b7
--- /dev/null
+++ b/test/unit/modules/core/tracker/browser-spec.js
@@ -0,0 +1,195 @@
+/* globals: sinon */
+var expect = require("chai").expect,
+    JSON2 = require("JSON2");
+
+var Keen = require("../../../../../src/keen"),
+    keenHelper = require("../../../helpers/test-config");
+
+describe("Tracker (browser)", function() {
+
+  describe("#addEvent", function() {
+
+    describe("Keen.enabled", function(){
+
+      beforeEach(function() {
+        this.client = new Keen({ projectId: "123" });
+      });
+
+      it("should not send events if set to \"false\"", function(){
+        Keen.enabled = false;
+        this.client.addEvent("not-going", { test: "data" }, function(err, res){
+          expect(err).to.exist;
+          expect(res).to.be.null;
+        });
+        Keen.enabled = true;
+      });
+
+    });
+
+    describe("enforce correct arguments for #addEvent", function(){
+
+      beforeEach(function() {
+        this.client = new Keen({ projectId: "123" });
+      });
+
+      it("should return an error message if event collection is omitted", function(){
+        this.client.addEvent(null, { test: "data" }, function(err, res){
+          expect(err).to.exist;
+          expect(res).to.be.null;
+        });
+      });
+
+    });
+
+    describe("via XHR/CORS (if supported)", function(){
+
+      beforeEach(function() {
+        var self = this;
+        self.client = new Keen({
+          projectId: keenHelper.projectId,
+          writeKey: keenHelper.writeKey,
+          // host: keenHelper.host,
+          requestType: "xhr"
+        });
+        self.postUrl = self.client.url("/events/" + keenHelper.collection);
+        self.server = sinon.fakeServer.create();
+      });
+
+      afterEach(function(){
+        this.server.restore();
+      });
+
+      if ('withCredentials' in new XMLHttpRequest()) {
+
+        it("should POST to the API using XHR", function() {
+          var callback = sinon.spy();
+          this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, keenHelper.responses.success ] );
+          this.client.addEvent(keenHelper.collection, keenHelper.properties, callback);
+          this.server.respond();
+          expect(this.server.responses[0].response[2]).to.equal(keenHelper.responses["success"]);
+          expect(callback.calledOnce).to.be.ok;
+          expect(callback.calledWith( null, JSON.parse(keenHelper.responses["success"]) )).to.be.ok;
+        });
+
+        it("should call the error callback on error", function() {
+          var callback = sinon.spy();
+          this.client.addEvent(keenHelper.collection, keenHelper.properties, function(err, res){
+            expect(err).to.exist;
+            expect(res).to.be.null;
+          });
+          this.server.respondWith( "POST", this.postUrl, [ 500, { "Content-Type": "application/json"}, keenHelper.responses["error"] ] );
+          this.server.respond();
+          expect(this.server.responses[0].response[2]).to.equal(keenHelper.responses["error"]);
+          // expect(callback.calledWith(n)).not.to.be.ok;
+          // expect(callbacks[1].calledOnce).to.be.ok;
+          // expect(callbacks[1].calledWith(JSON.parse(keenHelper.responses["error"]))).to.be.ok;
+        });
+
+      }
+
+    });
+
+    // describe("via JSONP to a fake server", function(){
+    //   beforeEach(function() {
+    //     this.client = new Keen({
+    //       projectId: keenHelper.projectId,
+    //       writeKey: keenHelper.writeKey,
+    //       host: keenHelper.host,
+    //       requestType: 'jsonp'
+    //     });
+    //   });
+    // });
+    //
+    // describe("via Image Beacon to a fake server", function(){
+    //   beforeEach(function() {
+    //     this.client = new Keen({
+    //       projectId: keenHelper.projectId,
+    //       writeKey: keenHelper.writeKey,
+    //       host: keenHelper.host,
+    //       requestType: 'beacon'
+    //     });
+    //   });
+    // });
+
+  });
+
+  describe("#addEvents", function() {
+
+    beforeEach(function() {
+      this.client = new Keen({ projectId: "123", writeKey: "2312" });
+      this.batchData = {
+        "pageview": [
+          { page: "this one" },
+          { page: "same!" }
+        ],
+        "click": [
+          { page: "tada!" },
+          { page: "same again" }
+        ]
+      };
+      this.batchResponse = JSON2.stringify({
+        click: [
+          { "success": true }
+        ],
+        pageview: [
+          { "success": true },
+          { "success": true }
+        ]
+      });
+    });
+
+    it("should not send events if Keen.enabled is set to \"false\"", function(){
+      Keen.enabled = false;
+      this.client.addEvents(this.batchData, function(err, res){
+        expect(err).to.exist;
+        expect(res).to.be.null;
+      });
+      Keen.enabled = true;
+    });
+
+    it("should return an error message if first argument is not an object", function(){
+      this.client.addEvents([], function(err, res){
+        expect(err).to.exist;
+        expect(res).to.be.null;
+      });
+    });
+
+    describe("via XHR/CORS (if supported)", function(){
+
+      beforeEach(function() {
+        // var self = this;
+        this.postUrl = this.client.url("/events");
+        this.server = sinon.fakeServer.create();
+      });
+
+      afterEach(function(){
+        this.server.restore();
+      });
+
+      if ('withCredentials' in new XMLHttpRequest()) {
+
+        it("should POST to the API using XHR", function() {
+          var callback = sinon.spy();
+          this.client.addEvents(this.batchData, callback);
+          this.server.respondWith( "POST", this.postUrl, [ 200, { "Content-Type": "application/json"}, keenHelper.responses["error"] ] );
+          this.server.respond();
+          expect(this.server.responses[0].response[2]).to.equal(keenHelper.responses["error"]);
+          expect(callback.calledOnce).to.be.ok;
+        });
+
+        it("should call the error callback on error", function() {
+          var callback = sinon.spy();
+          this.client.addEvents(this.batchData, callback);
+          this.server.respondWith( "POST", this.postUrl, [ 500, { "Content-Type": "application/json"}, keenHelper.responses["error"] ] );
+          this.server.respond();
+          expect(this.server.responses[0].response[2]).to.equal(keenHelper.responses["error"]);
+          expect(callback.calledOnce).to.be.ok;
+        });
+
+      }
+
+    });
+
+  });
+
+});
diff --git a/test/unit/modules/core/tracker/server-spec.js b/test/unit/modules/core/tracker/server-spec.js
new file mode 100644
index 0000000..f83a73d
--- /dev/null
+++ b/test/unit/modules/core/tracker/server-spec.js
@@ -0,0 +1,115 @@
+var chai = require("chai"),
+    expect = require("chai").expect,
+    JSON2 = require("JSON2"),
+    spies = require("chai-spies");
+
+chai.use(spies);
+
+var Keen = require("../../../../../src/server"),
+    keenHelper = require("../../../helpers/test-config"),
+    mock = require("../../../helpers/mockServerRequests");
+
+Keen.debug = true;
+
+describe("Tracking (server)", function() {
+
+  beforeEach(function(){
+    this.client = new Keen({
+      projectId: keenHelper.projectId,
+      writeKey: keenHelper.writeKey
+    });
+  });
+
+  // afterEach(function(){
+  //
+  // });
+
+  describe("#addEvent", function() {
+
+    // it("should pass",function(){
+    //   expect(1).to.be.ok;
+    // });
+
+    it("should make an HTTP request",function(done){
+      mock.post("/events/" + keenHelper.collection, 201, keenHelper.responses.success);
+      this.client.addEvent( keenHelper.collection, keenHelper.properties, function(err, res) {
+        expect(err).to.be.null;
+        expect(res).to.deep.equal( JSON2.parse(keenHelper.responses.success) );
+        done();
+      });
+    });
+
+    it("should not make an HTTP request if Keen.enabled is set to \"false\"", function(done){
+      Keen.enabled = false;
+      this.client.addEvent( keenHelper.collection, keenHelper.properties, function(err, res){
+        expect(err).to.exist;
+        expect(res).to.not.exist;
+        done();
+      });
+      Keen.enabled = true;
+    });
+
+    it("should return an error message if event collection is omitted", function(done){
+      // this.client.on("error", spy);
+      this.client.addEvent( null, keenHelper.properties, function(err, res){
+        expect(err).to.exist;
+        expect(res).to.not.exist;
+        done();
+      });
+      // this.client.off("error", spy);
+    });
+
+  });
+
+  describe("#addEvents", function() {
+
+    beforeEach(function() {
+      this.batchData = {
+        "pageview": [
+          { page: "this one" },
+          { page: "same!" }
+        ],
+        "click": [
+          { page: "tada!" },
+          { page: "same again" }
+        ]
+      };
+      this.batchResponse = JSON2.stringify({
+        click: [
+          { "success": true }
+        ],
+        pageview: [
+          { "success": true },
+          { "success": true }
+        ]
+      });
+    });
+
+    it("should make an HTTP request",function(){
+      var self = this;
+      mock.post("/events", 201, self.batchResponse);
+      self.client.addEvents( self.batchData, function(err, res) {
+        expect(err).to.be.null;
+        expect(res).to.deep.equal( JSON2.parse(self.batchResponse) );
+      });
+    });
+
+    it("should not send events if Keen.enabled is set to \"false\"", function(){
+      Keen.enabled = false;
+      this.client.addEvents(this.batchData, function(err, res){
+        expect(err).to.exist;
+        expect(res).to.be.null;
+      });
+      Keen.enabled = true;
+    });
+
+    it("should return an error message if first argument is not an object", function(){
+      this.client.addEvents([], function(err, res){
+        expect(err).to.exist;
+        expect(res).to.be.null;
+      });
+    });
+
+  });
+
+});
diff --git a/test/unit/dataset.js b/test/unit/modules/dataset/dataset-spec.js
similarity index 96%
rename from test/unit/dataset.js
rename to test/unit/modules/dataset/dataset-spec.js
index 7600c4d..2f43294 100644
--- a/test/unit/dataset.js
+++ b/test/unit/modules/dataset/dataset-spec.js
@@ -1,3 +1,19 @@
+var expect = require("chai").expect;
+
+var Keen = require("../../../../src/core"),
+    keenHelper = require("../../helpers/test-config");
+
+var data_extraction = require("./sample-data/extraction"),
+    data_extraction_uneven = require("./sample-data/extraction-uneven")
+    data_metric = require("./sample-data/metric"),
+    data_groupBy = require("./sample-data/groupBy"),
+    data_groupBy_boolean = require("./sample-data/groupBy-boolean"),
+    data_interval_double_groupBy = require("./sample-data/interval-double-groupBy"),
+    data_interval_groupBy_empties = require("./sample-data/interval-groupBy-empties"),
+    data_interval_groupBy_boolean = require("./sample-data/interval-groupBy-boolean"),
+    data_interval_groupBy_nulls = require("./sample-data/interval-groupBy-nulls"),
+    data_funnel = require("./sample-data/funnel");
+
 describe("Keen.Dataset", function(){
 
   beforeEach(function(){
@@ -955,19 +971,15 @@ describe("Keen.Dataset", function(){
 
 
 
-    describe("#pick", function(){
-      it("should return a given index of an array", function(){
-        expect(this.ds.pick(["A","B"], 1)).to.eql("B");
-      });
-      describe("#getRowIndex", function(){
-        it("should return the first value of a given row (array)", function(){
-          expect(this.ds.getRowIndex(["Index", 0, 1, 2, 3])).to.eql("Index");
-        });
+    describe("#getRowIndex", function(){
+      it("should return the first value of a given row (array)", function(){
+        expect(this.ds.getRowIndex(["Index", 0, 1, 2, 3])).to.eql("Index");
       });
-      describe("#getColumnLabel", function(){
-        it("should return the first value of a given column (array)", function(){
-          expect(this.ds.getColumnLabel(["Series A", 1, 2, 3, 4,])).to.eql("Series A");
-        });
+    });
+    
+    describe("#getColumnLabel", function(){
+      it("should return the first value of a given column (array)", function(){
+        expect(this.ds.getColumnLabel(["Series A", 1, 2, 3, 4,])).to.eql("Series A");
       });
     });
 
diff --git a/test/unit/data/extraction-uneven.js b/test/unit/modules/dataset/sample-data/extraction-uneven.js
similarity index 98%
rename from test/unit/data/extraction-uneven.js
rename to test/unit/modules/dataset/sample-data/extraction-uneven.js
index 6bf79c5..1772a49 100644
--- a/test/unit/data/extraction-uneven.js
+++ b/test/unit/modules/dataset/sample-data/extraction-uneven.js
@@ -1,4 +1,4 @@
-var data_extraction_uneven = {"result":[
+module.exports = {"result":[
   {
     "keen": {
       "timestamp": "2014-02-12T01:44:25.310Z",
diff --git a/test/unit/data/extraction.js b/test/unit/modules/dataset/sample-data/extraction.js
similarity index 99%
rename from test/unit/data/extraction.js
rename to test/unit/modules/dataset/sample-data/extraction.js
index a99d738..9e84e7c 100644
--- a/test/unit/data/extraction.js
+++ b/test/unit/modules/dataset/sample-data/extraction.js
@@ -1,4 +1,4 @@
-var data_extraction = {
+module.exports = {
   "result": [
     {
       "keen": {
diff --git a/test/unit/data/funnel.js b/test/unit/modules/dataset/sample-data/funnel.js
similarity index 97%
rename from test/unit/data/funnel.js
rename to test/unit/modules/dataset/sample-data/funnel.js
index bd36df4..0be15cf 100644
--- a/test/unit/data/funnel.js
+++ b/test/unit/modules/dataset/sample-data/funnel.js
@@ -1,4 +1,4 @@
-var data_funnel = {
+module.exports = {
   "result": [
     42,
     32,
diff --git a/test/unit/data/groupBy-boolean.js b/test/unit/modules/dataset/sample-data/groupBy-boolean.js
similarity index 86%
rename from test/unit/data/groupBy-boolean.js
rename to test/unit/modules/dataset/sample-data/groupBy-boolean.js
index 402c398..779fc8c 100644
--- a/test/unit/data/groupBy-boolean.js
+++ b/test/unit/modules/dataset/sample-data/groupBy-boolean.js
@@ -1,4 +1,4 @@
-var data_groupBy_boolean = {
+module.exports = {
   "result": [
     {
       "switch": false,
diff --git a/test/unit/data/groupBy.js b/test/unit/modules/dataset/sample-data/groupBy.js
similarity index 99%
rename from test/unit/data/groupBy.js
rename to test/unit/modules/dataset/sample-data/groupBy.js
index 25de4ae..640babe 100644
--- a/test/unit/data/groupBy.js
+++ b/test/unit/modules/dataset/sample-data/groupBy.js
@@ -1,4 +1,4 @@
-var data_groupBy = {
+module.exports = {
   "result": [
     {
       "page": "http://dustinlarimer.com/",
diff --git a/test/unit/data/interval-double-groupBy.js b/test/unit/modules/dataset/sample-data/interval-double-groupBy.js
similarity index 97%
rename from test/unit/data/interval-double-groupBy.js
rename to test/unit/modules/dataset/sample-data/interval-double-groupBy.js
index b63d6ff..4c3ca06 100644
--- a/test/unit/data/interval-double-groupBy.js
+++ b/test/unit/modules/dataset/sample-data/interval-double-groupBy.js
@@ -1,4 +1,4 @@
-var data_interval_double_groupBy = {
+module.exports = {
   "result": [
     {
       "timeframe": { "start":"2014-04-22T07:00:00.000Z", "end":"2014-04-23T07:00:00.000Z" },
diff --git a/test/unit/data/interval-groupBy-boolean.js b/test/unit/modules/dataset/sample-data/interval-groupBy-boolean.js
similarity index 97%
rename from test/unit/data/interval-groupBy-boolean.js
rename to test/unit/modules/dataset/sample-data/interval-groupBy-boolean.js
index a66193f..e4e8f9c 100644
--- a/test/unit/data/interval-groupBy-boolean.js
+++ b/test/unit/modules/dataset/sample-data/interval-groupBy-boolean.js
@@ -1,4 +1,4 @@
-var data_interval_groupBy_boolean = {
+module.exports = {
   "result": [
     {
       "value": [
diff --git a/test/unit/data/interval-groupBy-empties.js b/test/unit/modules/dataset/sample-data/interval-groupBy-empties.js
similarity index 96%
rename from test/unit/data/interval-groupBy-empties.js
rename to test/unit/modules/dataset/sample-data/interval-groupBy-empties.js
index 17453f8..eabbcf3 100644
--- a/test/unit/data/interval-groupBy-empties.js
+++ b/test/unit/modules/dataset/sample-data/interval-groupBy-empties.js
@@ -1,4 +1,4 @@
-var data_interval_groupBy_empties = {
+module.exports = {
   "result": [
     {
       "value": [],
diff --git a/test/unit/data/interval-groupBy-nulls.js b/test/unit/modules/dataset/sample-data/interval-groupBy-nulls.js
similarity index 98%
rename from test/unit/data/interval-groupBy-nulls.js
rename to test/unit/modules/dataset/sample-data/interval-groupBy-nulls.js
index a511971..e2298ef 100644
--- a/test/unit/data/interval-groupBy-nulls.js
+++ b/test/unit/modules/dataset/sample-data/interval-groupBy-nulls.js
@@ -1,4 +1,4 @@
-var data_interval_groupBy_nulls = {
+module.exports = {
   "result": [
     {
       "value": [
diff --git a/test/unit/data/metric.js b/test/unit/modules/dataset/sample-data/metric.js
similarity index 50%
rename from test/unit/data/metric.js
rename to test/unit/modules/dataset/sample-data/metric.js
index e9de324..4f7a134 100644
--- a/test/unit/data/metric.js
+++ b/test/unit/modules/dataset/sample-data/metric.js
@@ -1,3 +1,3 @@
-var data_metric = {
+module.exports = {
   "result": 2450
 };
diff --git a/test/unit/dataviz.js b/test/unit/modules/dataviz/dataviz-spec.js
similarity index 96%
rename from test/unit/dataviz.js
rename to test/unit/modules/dataviz/dataviz-spec.js
index 19d09c2..0db8c21 100644
--- a/test/unit/dataviz.js
+++ b/test/unit/modules/dataviz/dataviz-spec.js
@@ -1,3 +1,9 @@
+/* globals: sinon */
+var expect = require("chai").expect;
+
+var Keen = require("../../../../src/core"),
+    keenHelper = require("../../helpers/test-config");
+
 describe("Keen.Dataviz", function(){
 
   beforeEach(function(){
@@ -315,6 +321,13 @@ describe("Keen.Dataviz", function(){
   });
 
   describe("#el", function(){
+
+    beforeEach(function(){
+      var elDiv = document.createElement("div");
+      elDiv.id = "chart-test";
+      document.body.appendChild(elDiv);
+    });
+
     it("should return undefined by default", function(){
       expect(this.dataviz.el()).to.be.an("undefined");
     });
@@ -391,7 +404,15 @@ describe("Keen.Dataviz", function(){
 
   describe("Adapter actions", function(){
     beforeEach(function(){
-      registerDemoAdapter();
+      Keen.Dataviz.register("demo", {
+        "chart": {
+          initialize: sinon.spy(),
+          render: sinon.spy(),
+          update: sinon.spy(),
+          destroy: sinon.spy(),
+          error: sinon.spy()
+        }
+      });
       this.dataviz.adapter({ library: "demo", chartType: "chart" });
     });
 
@@ -455,16 +476,3 @@ describe("Keen.Dataviz", function(){
   });
 
 });
-
-
-function registerDemoAdapter(){
-  Keen.Dataviz.register("demo", {
-    "chart": {
-      initialize: sinon.spy(),
-      render: sinon.spy(),
-      update: sinon.spy(),
-      destroy: sinon.spy(),
-      error: sinon.spy()
-    }
-  });
-}
diff --git a/test/unit/modules/server/scoped-keys-spec.js b/test/unit/modules/server/scoped-keys-spec.js
new file mode 100644
index 0000000..06bf558
--- /dev/null
+++ b/test/unit/modules/server/scoped-keys-spec.js
@@ -0,0 +1,51 @@
+var expect = require("chai").expect;
+
+var Keen = require("../../../../src/server"),
+    keenHelper = require("../../helpers/test-config");
+
+describe("Scoped Keys", function(){
+
+  beforeEach(function() {
+    this.client = new Keen({
+      projectId  : keenHelper.projectId,
+      masterKey  : keenHelper.masterKey
+    });
+  });
+
+  it("should encrypt a scoped key with given options", function() {
+
+    var options = {
+      "allowed_operations": ["read"],
+      "filters": [ {
+        "property_name": "purchase.amount",
+        "operator": "eq",
+        "property_value": 56
+      }, {
+        "property_name": "purchase.name",
+        "operator": "ne",
+        "property_value": "Barbie"
+      }]
+    };
+    // Encrypt a scoped key..
+    var scopedKey = Keen.utils.encryptScopedKey(this.client.masterKey(), options);
+    // ..then decrypt it
+    var decryptedOptions = Keen.utils.decryptScopedKey(this.client.masterKey(), scopedKey);
+    expect(decryptedOptions).to.deep.equal(options);
+  });
+
+  it("should decrypt a scoped key and return the correct options", function() {
+
+    var apiKey = "f5d7c745ba4f437a82db02ca8b416556";
+    var scopedKey = "7b8f357fa55e35efb2f7fa51a03ec2835c5537e57457c5a7c1c40c454fc00d5addef7ed911303fc2fa9648d3ae13e638192b86e90cd88657c9dc5cf03990cbf6eb2a7994513d34789bd25447f3dccaf5a3de3b9cacf6c11ded581e0506fca147ea32c13169787bbf8b4d3b8f2952bc0bea1beae3cfbbeaa1f421be2eac4cc223";
+    var options = {
+      "filters": [{
+        "property_name": "account_id",
+        "operator": "eq",
+        "property_value": "4d9a4c421d011c553e000001"
+      }]
+    };
+    var decryptedOptions = Keen.utils.decryptScopedKey(apiKey, scopedKey);
+    expect(decryptedOptions).to.deep.equal(options);
+  });
+
+});
diff --git a/test/unit/utils.js b/test/unit/modules/utils/utils-spec.js
similarity index 72%
rename from test/unit/utils.js
rename to test/unit/modules/utils/utils-spec.js
index 823d63d..00601ac 100644
--- a/test/unit/utils.js
+++ b/test/unit/modules/utils/utils-spec.js
@@ -7,12 +7,12 @@ describe('Keen.utils', function() {
       .and.to.be.a('function');
     expect(Keen.utils.parseParams).to.exist
       .and.to.be.a('function');
-    expect(Keen.utils.prettyNumber).to.exist
-      .and.to.be.a('function');
-    expect(Keen.utils.loadScript).to.exist
-      .and.to.be.a('function');
-    expect(Keen.utils.loadStyle).to.exist
-      .and.to.be.a('function');
+    // expect(Keen.utils.prettyNumber).to.exist
+    //   .and.to.be.a('function');
+    // expect(Keen.utils.loadScript).to.exist
+    //   .and.to.be.a('function');
+    // expect(Keen.utils.loadStyle).to.exist
+    //   .and.to.be.a('function');
   });
 
   // describe('#each', function(){
diff --git a/test/unit/server.js b/test/unit/server.js
new file mode 100644
index 0000000..9aa5397
--- /dev/null
+++ b/test/unit/server.js
@@ -0,0 +1,14 @@
+// -------------------------
+// Common modules
+// -------------------------
+require("./modules/core/client-spec");
+require("./modules/core/events-spec");
+require("./modules/core/query-spec");
+require("./modules/dataset/dataset-spec");
+
+// -------------------------
+// Server-specific modules
+// -------------------------
+require("./modules/core/tracker/server-spec");
+require("./modules/core/request/server-spec");
+require("./modules/server/scoped-keys-spec");
diff --git a/test/unit/track.js b/test/unit/track.js
deleted file mode 100644
index e7b9b7d..0000000
--- a/test/unit/track.js
+++ /dev/null
@@ -1,146 +0,0 @@
-describe("Keen tracking methods", function() {
-
-  describe("#addEvent", function() {
-
-    describe("Keen.enabled", function(){
-
-      beforeEach(function() {
-        this.project = new Keen({ projectId: "123" });
-      });
-
-      it("should not send events if set to \"false\"", function(){
-        var success = sinon.spy(),
-            error = sinon.spy();
-        Keen.enabled = false;
-        this.project.addEvent("not-going", { test: "data" }, success, error);
-        Keen.enabled = true;
-        expect(success.calledOnce).not.to.be.ok;
-        expect(error.calledOnce).not.to.be.ok;
-      });
-
-    });
-
-    describe("enforce correct arguments for #addEvent", function(){
-
-      beforeEach(function() {
-        this.project = new Keen({ projectId: "123" });
-      });
-
-      it("should return an error message if event collection is omitted", function(){
-        var success = sinon.spy(),
-            error = sinon.spy();
-        this.project.addEvent(null, { test: "data" }, success, error);
-        expect(success.calledOnce).not.to.be.ok;
-        expect(error.calledOnce).to.be.ok;
-      });
-
-    });
-
-    describe("via XHR/CORS (if supported)", function(){
-
-      beforeEach(function() {
-        var self = this;
-        self.project = new Keen({
-          projectId: keenHelper.projectId,
-          writeKey: keenHelper.writeKey,
-          host: keenHelper.host,
-          requestType: 'xhr'
-        });
-        self.postUrl = self.project.url("/projects/" + self.project.projectId() + "/events/" + keenHelper.collection);
-        self.server = sinon.fakeServer.create();
-        self.respondWith = function(code, body){
-          self.server.respondWith("POST", self.postUrl,
-            [code, { "Content-Type": "application/json"}, body]);
-        };
-      });
-
-      afterEach(function(){
-        this.server.restore();
-      });
-
-      if ('withCredentials' in new XMLHttpRequest()) {
-
-        it("should post to the API using xhr where CORS is supported", function() {
-
-          var callbacks = [sinon.spy(), sinon.spy()];
-          this.respondWith(200, keenHelper.responses.success);
-          this.project.addEvent(keenHelper.collection, keenHelper.properties, callbacks[0], callbacks[1]);
-          this.server.respond();
-
-          expect(this.server.requests[0].requestBody)
-            .to.equal(JSON.stringify(keenHelper.properties));
-          expect(callbacks[0].calledOnce).to.be.ok;
-          expect(callbacks[0].calledWith(JSON.parse(keenHelper.responses.success))).to.be.ok;
-          expect(callbacks[1].calledOnce).not.to.be.ok;
-
-        });
-
-        it("should call the error callback on error", function() {
-
-          var callbacks = [sinon.spy(), sinon.spy()];
-          this.respondWith(500, keenHelper.responses.error);
-          this.project.addEvent(keenHelper.collection, keenHelper.properties, callbacks[0], callbacks[1]);
-          this.server.respond();
-
-          expect(this.server.requests[0].requestBody)
-            .to.equal(JSON.stringify(keenHelper.properties));
-          expect(callbacks[0].calledOnce).not.to.be.ok;
-          expect(callbacks[1].calledOnce).to.be.ok;
-
-        });
-
-      }
-
-    });
-
-    describe("via JSONP to a fake server", function(){
-
-      beforeEach(function() {
-        this.project = new Keen({
-          projectId: keenHelper.projectId,
-          writeKey: keenHelper.writeKey,
-          host: keenHelper.host,
-          requestType: 'jsonp'
-        });
-      });
-
-      // it("should add a script tag with a URL that has data and modified params", function(){
-      //
-      //   this.project.addEvent(keenHelper.collection, keenHelper.properties);
-      //   var tag = document.getElementById("keen-jsonp");
-      //   expect(tag).to.exist;
-      //   expect(tag.src).to.contain("data=");
-      //   expect(tag.src).to.contain("modified=");
-      //
-      // });
-
-    });
-
-    describe("via Image Beacon to a fake server", function(){
-
-      /*
-      beforeEach(function() {
-        this.project = new Keen({
-          projectId: keenHelper.projectId,
-          writeKey: keenHelper.writeKey,
-          host: keenHelper.host,
-          requestType: 'beacon'
-        });
-      });
-
-      it("should add an image tag", function(){
-
-        var callbacks = [function(){ console.log('here'); }, sinon.spy()];
-        this.project.addEvent(keenHelper.collection, keenHelper.properties, callbacks[0], callbacks[1]);
-
-        var tag = document.getElementById("keen-beacon");
-        //expect(tag).to.exist;
-        //expect(callbacks[0].calledOnce).to.be.ok;
-
-      });
-      */
-
-    });
-
-  });
-});
diff --git a/test/unit/visualization.js b/test/unit/visualization.js
deleted file mode 100644
index b0f976a..0000000
--- a/test/unit/visualization.js
+++ /dev/null
@@ -1,26 +0,0 @@
-describe("Keen.Visualization", function(){
-  beforeEach(function(){
-    var el = document.getElementById("chart-test");
-    this.viz = new Keen.Visualization({ result: 0 }, el);
-  });
-  afterEach(function(){
-    this.viz.destroy();
-    this.viz = null;
-    Keen.Dataviz.visuals = new Array();
-  });
-  describe("constructor", function(){
-    it("should return a new Keen.Dataviz instance", function(){
-      expect(this.viz).to.be.an.instanceof(Keen.Dataviz);
-    });
-    it("should contain view attributes matching Keen.Visualization.defaults", function(){
-      expect(this.viz.attributes()).to.deep.equal(Keen.Visualization.defaults);
-    });
-    it("should contain view defaults matching Keen.Dataviz.defaults", function(){
-      expect(this.viz.view.defaults).to.deep.equal(Keen.Dataviz.defaults);
-    });
-    it("should be appended to Keen.Dataviz.visuals", function(){
-      expect(Keen.Dataviz.visuals).to.have.length(1);
-      expect(Keen.Dataviz.visuals[0]).and.to.be.an.instanceof(Keen.Dataviz);
-    });
-  });
-});
diff --git a/test/assets b/test/vendor
similarity index 100%
rename from test/assets
rename to test/vendor