diff --git a/Gruntfile.js b/Gruntfile.js
index 63773c0..95692b4 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -63,10 +63,10 @@ module.exports = function(grunt) {
 
         copy: {
             main: {
-                cwd: 'lib/v1/blogger',
+                cwd: 'lib/v2/blogger',
                 expand: true,  // required for cwd
                 src: '**/*',
-                dest: 'www/v1/blogger/',
+                dest: 'www/v2/blogger/',
             },
         },
 
diff --git a/README.md b/README.md
index 6226fe8..0b0272e 100644
--- a/README.md
+++ b/README.md
@@ -23,39 +23,25 @@ Development section below.
 
 ## Documentation
 
-For now ocumentation for widgets API is present in JSDoc comments,
+For now documentation for widgets API is present in JSDoc comments,
 but not generated into more readable format.
 
 Configuration options:
 - `window.grtpAPI` - Where to look for the grtp.co API
-  - defaults to `//grtp.co/v1/`
+  - defaults to `//grtp.co/v2/`
 - `window.gratipayURI` - Where to look for Gratipay
   - defaults to `https://gratipay.com/`
 
 
 ## Examples
 
-In the following examples, just switch out `rummik` with your Gratipay username.
+In the following examples, just switch out `my-team` with your Gratipay Team slug.
 
 ### Standard Widgets
-![](https://cloud.githubusercontent.com/assets/134455/4095888/3e6d7758-2fba-11e4-935f-14e30c32ac1e.png)
+![](https://cloud.githubusercontent.com/assets/3729038/16357975/9584b358-3acb-11e6-821c-ece9d855dca1.png)
 ```html
-<script data-gratipay-username="rummik"
-  src="//grtp.co/v1.js" async></script>
-```
-
-![](https://cloud.githubusercontent.com/assets/134455/4095889/3fb3b5f0-2fba-11e4-8adb-250a0dc4e9cf.png)
-```html
-<script data-gratipay-username="rummik"
-  data-gratipay-widget="button"
-  src="//grtp.co/v1.js" async></script>
-```
-
-![](https://cloud.githubusercontent.com/assets/134455/4095908/997bc05a-2fba-11e4-99cb-56ad9cbad392.png)
-```html
-<script data-gratipay-username="rummik"
-  data-gratipay-widget="giving"
-  src="//grtp.co/v1.js" async></script>
+<script data-gratipay-teamslug="my-team"
+  src="//grtp.co/v2.js" async></script>
 ```
 
 ### Custom Widgets
@@ -63,29 +49,23 @@ You can create your own widgets by adding `data-gratipay-widget="custom"` to you
 widget's HTML, and the following classes:
 
 - Text
+  - `gratipay-teamslug` - the Team's slug
   - `gratipay-receiving` - dollar-sign prefixed value of `receiving`
-  - `gratipay-username` - the user's username
-  - `gratipay-goal` - dollar-sign prefixed value of `goal`
-  - `gratipay-giving` - dollar-sign prefixed value of `giving`
-  - `gratipay-identity` - `I` if `number` is `singular`, `We` if `number` is
-    `plural`
 - Links
-  - `gratipay-profile-link` - sets the `href` attribute to the user's profile
+  - `gratipay-profile-link` - sets the `href` attribute to the Team's profile
     link
   - `gratipay-link` - sets the `href` attribute to https://gratipay.com/
 - Misc styling
-  - `gratipay-goal-progress-bar` - sets the element's width to a percentage value
-    of the user's goal progress
 
 
 ```html
-<div data-gratipay-username="rummik" data-gratipay-widget="custom">
+<div data-gratipay-teamslug="my-team" data-gratipay-widget="custom">
   I receive <a class="gratipay-profile-link">
     <span class="gratipay-receiving">$0.00</span> / wk
   </a>
   on <a class="gratipay-link">Gratipay</a>.
 </div>
-<script src="//grtp.co/v1.js"></script>
+<script src="//grtp.co/v2.js"></script>
 ```
 
 
@@ -96,7 +76,7 @@ widget's HTML, and the following classes:
 <img src="http://img.shields.io/gratipay/Gratipay.svg">
 ```
 
-[Google Gadget](lib/v1/blogger) for Blogger.
+[Google Gadget](lib/v2/blogger) for Blogger.
 
 
 ## Development
diff --git a/lib/v2.js b/lib/v2.js
new file mode 100644
index 0000000..6d85f52
--- /dev/null
+++ b/lib/v2.js
@@ -0,0 +1,50 @@
+/**
+ * Gratipay widget main initialization.
+ *
+ * Initializes widgets and pulls in the Widgets API if it isn't already loaded
+ */
+(function() {
+    'use strict';
+
+    // Short wrapper around document.querySelectorAll()
+    function $(selector) {
+        return document.querySelectorAll(selector);
+    }
+
+    // Slurp up widgets (identified by having the `data-gratipay-username` property)
+    var elements = $('[data-gratipay-teamslug]');
+
+    // Cache length
+    var length = elements.length;
+
+    // Grab window.Gratipay if available
+    var Gratipay = window.Gratipay || {};
+
+    // Where's our files?
+    var api = window.grtpAPI || 'https://grtp.co/v2/';
+
+    window._grtp = window._grtp || [];
+
+    // Load widget API if it hasn't been
+    if (!Gratipay.widgets && !$('script[src="' + api + 'api.js"]').length) {
+        var grtp = document.createElement('script');
+        grtp.src = api + 'api.js';
+        $('head')[0].appendChild(grtp);
+    }
+
+    // Load widgets
+    for (var i=0; i<length; i++) {
+        var element = elements[i];
+
+        // Ignore widgets with the `data-gratipay-readystatus` property
+        if (!element.getAttribute('data-gratipay-readystatus')) {
+            if (Gratipay.widgets) {
+                Gratipay.widgets.load(element);
+            } else {
+                _grtp.push(element);
+            }
+
+            element.setAttribute('data-gratipay-readystatus', 'loading');
+        }
+    }
+})();
diff --git a/lib/v2/api.js b/lib/v2/api.js
new file mode 100644
index 0000000..22a3c6f
--- /dev/null
+++ b/lib/v2/api.js
@@ -0,0 +1,417 @@
+(function(_) {
+    'use strict';
+
+    var api = window.grtpAPI || 'https://grtp.co/v2/';
+    var gratipayURI = window.gratipayURI || 'https://gratipay.com/';
+    var _grtp = window._grtp || [];
+
+    // Define window.Gratipay if it hasn't previously been defined
+    if (!window.Gratipay) {
+        window.Gratipay = {};
+    }
+
+    Gratipay.users = {
+        /**
+         * @private
+         * Request data for a user from a user's json endpoint
+         *
+         * @param {String} [service] Service name
+         * @param {String} user User name
+         * @param {String} endpoint JSON endpoint
+         * @param {Function} callback(data) Callback with data from JSON endpoint
+         */
+        _get: function(service, user, endpoint, callback) {
+            if (!callback) {
+                callback = endpoint;
+                endpoint = user;
+                user = service;
+                service = undefined;
+            }
+
+            var serviceURI = '';
+            if (service) {
+                serviceURI = 'on/' + service + '/';
+            }
+
+            // Use CORS XHR instead of JSONp if protocols match or we're being called from tests
+            // Mostly so our mock Gratipay API works, but CORS is a bit cleaner regardless
+            var mode = new RegExp('^(/|' + location.protocol + ')').test(gratipayURI) ? 'json' : 'jsonp';
+            _[mode](gratipayURI + serviceURI + encodeURIComponent(user) + '/' + endpoint + '.json', callback);
+        },
+
+        // TODO: Add some sort of helper function so we aren't repeating the same
+        //       6 lines of code with a single string changed for every endpoint.
+        //       At the moment the duplicated code is just in are getPublic()
+        //       and getCharts(), but it'll be required for every endpoint added.
+
+        /**
+         * Get a user's public.json
+         *
+         * @param {String} [service] Service name
+         * @param {String} user User name
+         * @param {Function} callback(data) Callback with data from user's public.json
+         */
+        getPublic: function(service, user, callback) {
+            if (!callback) {
+                callback = user;
+                user = service;
+                service = undefined;
+            }
+
+            this._get(service, user, 'public', callback);
+        },
+
+        /**
+         * Get a user's charts.json
+         * @param {String} [service] Service name
+         * @param {String} user User name
+         * @param {Function} callback(data) Callback with data from user's charts.json
+         */
+        getCharts: function(user, callback) {
+            if (!callback) {
+                callback = user;
+                user = service;
+                service = undefined;
+            }
+
+            this._get(user, 'charts', callback);
+        }
+    };
+
+    Gratipay.widgets = {
+        _: _,
+
+        /**
+         * Apply public.json data to a widget
+         *
+         * @param {Element} element Widget element
+         * @param {Function} [cb(data)] Callback
+         */
+        apply: function(element, cb) {
+            var teamslug = element.getAttribute('data-gratipay-teamslug');
+
+            function set(className, property, value, attribute, append) {
+                var elements = element.querySelectorAll('.gratipay-' + className);
+                _.each(elements, function(element) {
+                    if (attribute) {
+                        element.setAttribute(property, (append ? '' + element.getAttribute(property) : '') + value);
+                    } else {
+                        element[property] = value;
+                    }
+                });
+            }
+
+            function css(className, value) {
+                set(className, 'style', ';' + value, true, true);
+            }
+
+            function text(className, value) {
+                set(className, 'innerHTML', value);
+            }
+
+            function link(className, value) {
+                if (!element.hasAttribute('target')) {
+                    set(className, 'target', '_top', true);
+                }
+
+                set(className, 'href', value, true);
+            }
+
+            // Set up links and team slug before requesting public.json
+            link('profile-link', gratipayURI + encodeURIComponent(teamslug) + '/');
+            link('link', gratipayURI);
+            text('slug', teamslug);
+
+            Gratipay.users.getPublic(teamslug, function(data) {
+                element.setAttribute('data-gratipay-readystatus', 'ready');
+                // Solve lack of two significant digits in some cases (http://stackoverflow.com/a/4937261/2152245)
+              //  text('receiving', (data.receiving)? '$' + parseFloat(data.receiving).toFixed(2) : '$' + parseFloat(data.receiving).toFixed(2));
+                text('receiving', data.receiving);
+                text('slug', data.slug);
+                text('my-tip-button', data.my_tip == 'self' ? 'You!' : (+data.my_tip > 0 ? data.my_tip : 'Gratipay')); // jshint ignore:line
+                link('profile-link', gratipayURI + encodeURIComponent(data.slug) + '/');
+                link('link', gratipayURI);
+
+                if (typeof cb == 'function') {
+                    cb(data);
+                }
+            });
+        },
+
+        /**
+         * Get the HTML for a widget
+         *
+         * @param {String} widget Widget name
+         * @param {Function} cb(widget) Callback with widget element
+         */
+        getWidget: function(widget, cb) {
+            _.get(api + 'widgets/' + widget + '.html', function(data) {
+                // Fix for automatic scheme detection within injected <iframe>
+                // elements -- where many browsers will interpret url(//grtp.co)
+                // as url(about://grtp.co)
+                data = data.replace(/url\((['"])?\/\//g, 'url($1' + location.protocol + '//');
+
+                var widget = document.createElement('div');
+                widget.innerHTML = data;
+                cb(widget);
+            });
+        },
+
+        /**
+         * Load a widget using data from `element`
+         *
+         * @param {Element} element DOM Element
+         */
+        load: function(element) {
+            var widgetType = element.getAttribute('data-gratipay-widget') || 'default';
+            var teamslug = element.getAttribute('data-gratipay-teamslug');
+
+            // Set a readystate on the element
+            element.setAttribute('data-gratipay-readystatus', 'loading api.js');
+
+            // Skip to applying widget data if this is a custom/user-defined widget
+            if (['false', 'none', 'user-defined', 'custom'].indexOf(widgetType.toLowerCase()) != -1) {
+                return Gratipay.widgets.apply(element);
+            }
+
+            // Get the widget (defined by widgetType)
+            Gratipay.widgets.getWidget(widgetType, function(widget) {
+                var container = _.jsonml(['iframe', {
+                    style: 'border:0;margin:0;padding:0;width:0;height:0'
+                }]);
+
+                var style = _.jsoncss([
+                    ['body', {
+                        margin: 0,
+                        padding: 0,
+                        overflow: 'hidden'
+                    }],
+                    ['body > div', {
+                        float: 'left'
+                    }]
+                ]);
+
+                // FireFox's <iframe> gives a false-positive contentDocument.body
+                // so we need to hook the onload event
+                function onload() {
+                    container.contentDocument.head.appendChild(style);
+                    container.contentDocument.body.appendChild(widget);
+
+                    // Expose Gratipay to widgets within iframe
+                    container.contentWindow.Gratipay = {
+                        users: Gratipay.users
+                    };
+
+                    // Resize the container <iframe> to fit the content
+                    (function resize() {
+                        container.style.width = widget.clientWidth + 'px';
+                        container.style.height = widget.clientHeight + 'px';
+
+                        setTimeout(resize, 500);
+                    })();
+
+                    Gratipay.widgets.apply(widget, function() {
+                        element.setAttribute('data-gratipay-readystatus', 'ready');
+                    });
+                }
+
+                // IE 8 requires .attachEvent(), everybody else can use .onload
+                if (container.attachEvent) {
+                    container.attachEvent('onload', onload);
+                } else {
+                    container.onload = onload;
+                }
+
+                widget.setAttribute('data-gratipay-teamslug', teamslug);
+                element.parentNode.insertBefore(container, element);
+            });
+        },
+
+        /**
+         * Widget initialization
+         */
+        init: function() {
+            _.each(_grtp, this.load);
+        }
+    };
+
+    Gratipay.widgets.init();
+})({
+    // Helpers
+
+    /**
+     * Iterate over an array
+     *
+     * @param {Array} array Array to iterate over
+     * @param {Function} fn(item, index, length) Callback function
+     */
+    each: function(array, fn) {
+        'use strict';
+
+        var length = array.length;
+        for (var i=0; i<length; i++) {
+            fn(array[i], i, length);
+        }
+    },
+
+    /**
+     * JSONCSS parser
+     *
+     * @param {Array} jsoncss JSONCSS selector list
+     * @return {Element} `<style>` element
+     */
+    jsoncss: function(jsoncss) {
+        'use strict';
+
+        var _ = this;
+        var css = '';
+
+        _.each(jsoncss, function(selector) {
+            if (typeof selector == 'string') {
+                return css += selector;
+            }
+
+            css += selector.shift() + '{';
+
+            _.each(selector, function(properties) {
+                var value, property;
+                for (property in properties) {
+                    // Fix for automatic scheme detection within injected <iframe>
+                    // elements -- where many browsers will interpret url(//grtp.co)
+                    // as url(about://grtp.co)
+                    value = properties[property]
+                            .toString()
+                            .replace(/url\((['"])?\/\//g, 'url($1' + location.protocol + '//');
+
+                    css += property + ':' + value + ';';
+                }
+            });
+
+            css += '}';
+        });
+
+        return this.jsonml(['style', css]);
+    },
+
+    /**
+     * Simple JSONML parser
+     * See: http://www.jsonml.org/
+     *
+     * @param {Array} jsonml JSONML element
+     * @return {Element}
+     */
+    jsonml: function(jsonml) {
+        'use strict';
+
+        var _ = this;
+        var node = document.createElement(jsonml.shift());
+
+        _.each(jsonml, function(token) {
+            if (typeof token === 'undefined') {
+                return;
+            }
+
+            switch (token.constructor) {
+                // Attributes to be applied to our node
+                case Object:
+                    for (var attribute in token) {
+                        node.setAttribute(attribute, token[attribute]);
+                    }
+                    break;
+
+                // Child elements
+                case Array:
+                    node.appendChild(_.jsonml(token));
+                    break;
+
+                // Text nodes
+                case String:
+                case Number:
+                    node.appendChild(document.createTextNode(token));
+                    break;
+
+                // Anything else should be considered a DOM Element
+                default:
+                    node.appendChild(token);
+                    break;
+            }
+        });
+
+        return node;
+    },
+
+    /**
+     * Quick and dirty JSONp
+     *
+     * @param {String} url URL of JSON file
+     * @param {Function} cb(json) Callback function
+     */
+    jsonp: function(url, cb) {
+        'use strict';
+
+        var _cb = '_req' + Math.floor(Math.random() * 1000);
+        window[_cb] = function(_) { cb(_); delete window[_cb]; };
+        document.head.appendChild(this.jsonml(['script', { src: url + '?callback=' + _cb }]));
+    },
+
+    // Private XHR wrapper
+    _xhr: function(cb) {
+        'use strict';
+
+        var xhr = new XMLHttpRequest();
+
+        // Use XDomainRequest if CORS via XMLHttpRequest is unavailable
+        if (xhr.withCredentials === undefined && XDomainRequest) {
+            return this._xdr(cb);
+        }
+
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState == 4 && xhr.status == 200) {
+                cb();
+            }
+        };
+
+        return xhr;
+    },
+
+    // Private XDR wrapper
+    _xdr: function(cb) {
+        'use strict';
+
+        var xdr = new XDomainRequest();
+        xdr.onload = cb;
+        return xdr;
+    },
+
+    /**
+     * XHR wrapper
+     *
+     * @param {String} url URL of document to request
+     * @param {Function} cb(data) Callback function
+     */
+    get: function(url, cb) {
+        'use strict';
+
+        var xhr = this._xhr(function() {
+            cb(xhr.responseText);
+        });
+
+        xhr.open('GET', url);
+        xhr.send();
+    },
+
+    /**
+     * A little JSON
+     *
+     * @param {String} url URL of JSON file
+     * @param {Function} cb(json) Callback function
+     */
+    json: function(url, cb) {
+        'use strict';
+
+        this.get(url, function(data) {
+            cb(JSON.parse(data));
+        });
+    }
+
+});
diff --git a/lib/v2/blogger/README.md b/lib/v2/blogger/README.md
new file mode 100644
index 0000000..4200400
--- /dev/null
+++ b/lib/v2/blogger/README.md
@@ -0,0 +1,13 @@
+## Blogger
+
+To add Gratipay to Blogger, use the gadget from gratipay.xml. Go to your
+blog overview, then:
+
+    Layout -> Add a Gadget -> Add your own
+
+Enter URL ('https://' prefix didn't work for me):
+
+    grtp.co/v2/blogger/gratipay.xml
+
+Set your "Team slug on Gratipay" and view how it looks on your blog page.
+Blogger preview didn't work correctly for me, so don't pay attention to it.
diff --git a/lib/v2/blogger/gratipay.xml b/lib/v2/blogger/gratipay.xml
new file mode 100644
index 0000000..0640624
--- /dev/null
+++ b/lib/v2/blogger/gratipay.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Module>
+  <ModulePrefs title="Gratipay" height="72" /> 
+  <UserPref name="teamslug" display_name="Team slug on Gratipay"/>
+  <Content type="html">
+     <![CDATA[ 
+<script data-gratipay-teamslug="__UP_teamslug__"
+        src="//grtp.co/v2.js" async="true"></script>
+     ]]>
+  </Content> 
+</Module>
diff --git a/lib/v2/widgets/default.html b/lib/v2/widgets/default.html
new file mode 100644
index 0000000..7bf49d1
--- /dev/null
+++ b/lib/v2/widgets/default.html
@@ -0,0 +1,40 @@
+<!doctype html>
+<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:300,900">
+
+<div class="gratipay-widget">
+    <div class="gratipay-inner">
+        We receive<br>
+        <a class="gratipay-profile-link"><b class="gratipay-receiving">$0.00 / wk</b></a><br>
+        on <a class="gratipay-link">Gratipay</a>.
+    </div>
+</div>
+
+<style>
+.gratipay-widget {
+    font: normal 9pt/12pt Lato, sans-serif;
+    color: #614C3E;
+    width: 84pt;
+    display: inline-block;
+    border: 2px solid #614C3E;
+    border-radius: 6pt;
+    background: white url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAbrwAAG68BXhqRHAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAOYSURBVFiFzZdfaFtVHMc/v5OmLckGImoN1uGDCAUFFcpEabI7BrZJ1jLFviiMdJY+DH0Q/8A2NioroiCFKkgZriKrYlVclcQ+SGOLe+j6Ikzsi09aSEXQh7TVJs35+ZCmdmnuzU23gt+3+zu/8/t+zr3nnj+iqvjRy/F4y1rT+lG12qeGDlEiQGSrOadCTixLYmQ6vBmaHctkNvzUlXoAg33H2kpauIDKC8BBX7SQR/RKQJqHL01/9/ueAPr7H24+uH7nGyryOnDAp3G1VkX1nXzoz7enpn4q+AYY7DvWZkvFL1V4ao/GVSZcM4Hgs7Xexi6AVCL2iBjSwP23w3yHflNLYiI9d8MVIJVw7hVjF4H222xe0bJa0zmRzq5UAmbb3HFaJWCv7qM5QLsE7NWU47TuApCwPYdyeB/Ny1IOS9ie2/ZVVYa6o5FiUH4BQvsOUNZ6sKgPjs/M5wxAISjnPc2FIvAtwmsgXwA1fylgEfSMiL4n8JcHQGjLE3mpp6dlNbD2B+6LzAZC/PLXc7OVwEAy9iTCV8A9W6ECwtnV1rbRqampEsDJ3q5DATXXcJ9T+QOl8N0ycDzWo6oZd1h56/I335+pjg7GnfZSU+k5kJCWTHoinf2xOudUMtarwrRrZZF4k1rtQ9ztVez1WvFLmewyMOreE5o2dbEYdC+uVvuMGjq8ioB53LvdXZtN0unVroYOs7WruUpUkyLi8Y7cZZET3rWJGPAGAB4bSHa92qj5QDL6tIierJMWMXUSAFCRkVSv84Rf86HuaASRj8FrdpVlgFx9AoJi7aepE84d9VKHh8UUg3KF/35RL+WMig8AAOEBKdkP66X9uth1Fjjqp6QKOSOWJV8AAMozp47HTrs1v5iIRVXkgt9yYlkyYsR1oajNwLuphPNodXyo17nLGj4BAr4BjEyb8GZoFsg3wNBijP3sdL+zfUwTESlgPwLua6BOPrwZmjVjmcyGwmQDHVF46O9/9IPK80Ai+oooiQZrTI5lMhu3tB2LaEqUn63IDyjBBrrevB2Pz8znUO91vZZU5X2LfN6gOSij4zPzOdhxItI1cxFhoUGGMHCooR7Cgq6Zi9uP/5tDKcBEOruiljiwvD/mxHea7wIoQ8zdUGs69/A53CUslEd+852gJkAZIruieXMEZQRYvwXrdZQRzZsj1SPfZqt3OR3qjkYKQTkv8DwNXE4VJpuL+mZltrupLkBF+3U9/xemAYT9Row4ywAAAABJRU5ErkJggg==) 65pt 30pt no-repeat;
+    text-align: left;
+}
+
+.gratipay-inner {
+    display: block;
+    padding: 6pt 0 6pt 9pt;
+    overflow: hidden;
+}
+
+a {
+    color: #2A8F79;
+    text-decoration: none;
+    font-weight: bold;
+}
+
+b {
+    font-size: 12pt;
+    line-height: 14pt;
+}
+</style>
diff --git a/test/gratipay.com/anon-user/public.json b/test/gratipay.com/anon-user/public.json
index f16ee3b..bb32afe 100644
--- a/test/gratipay.com/anon-user/public.json
+++ b/test/gratipay.com/anon-user/public.json
@@ -14,6 +14,6 @@
     "npatrons": 0,
     "number": "singular",
     "on": "gratipay",
-    "receiving": null,
+    "taking": null,
     "username": "rohitpaulk"
 }
\ No newline at end of file
diff --git a/test/gratipay.com/gittip/public.json b/test/gratipay.com/gittip/public.json
index a018703..41ef0be 100644
--- a/test/gratipay.com/gittip/public.json
+++ b/test/gratipay.com/gittip/public.json
@@ -11,6 +11,6 @@
     "goal": null,
     "id": 20176,
     "number": "plural",
-    "receiving": "370.75",
+    "taking": "370.75",
     "username": "gratipay"
 }
\ No newline at end of file
diff --git a/test/gratipay.com/gratipay/public.json b/test/gratipay.com/gratipay/public.json
new file mode 100644
index 0000000..10a42da
--- /dev/null
+++ b/test/gratipay.com/gratipay/public.json
@@ -0,0 +1,11 @@
+{
+    "homepage": "https://gratipay.com/",
+    "name": "Gratipay",
+    "nreceiving_from": 297,
+    "onboarding_url": "http://inside.gratipay.com/big-picture/welcome",
+    "owner": "~Gratipay",
+    "receiving": 211.87,
+    "slug": "Gratipay",
+    "status": "approved",
+    "todo_url": "https://github.com/search?q=is%3Aopen+user%3Agratipay&type=Issues"
+}
\ No newline at end of file
diff --git a/test/gratipay.com/rummik/public.json b/test/gratipay.com/rummik/public.json
index 027b183..87d7772 100644
--- a/test/gratipay.com/rummik/public.json
+++ b/test/gratipay.com/rummik/public.json
@@ -27,6 +27,6 @@
     "goal": "250.00",
     "id": 16757,
     "number": "singular",
-    "receiving": "18.25",
+    "taking": "18.25",
     "username": "rummik"
 }
\ No newline at end of file
diff --git a/test/custom-widget-legacy.html b/test/v1/custom-widget-legacy.html
similarity index 100%
rename from test/custom-widget-legacy.html
rename to test/v1/custom-widget-legacy.html
diff --git a/test/custom-widget.html b/test/v1/custom-widget.html
similarity index 100%
rename from test/custom-widget.html
rename to test/v1/custom-widget.html
diff --git a/test/default-widget-anonymous.html b/test/v1/default-widget-anonymous.html
similarity index 100%
rename from test/default-widget-anonymous.html
rename to test/v1/default-widget-anonymous.html
diff --git a/test/default-widget-legacy.html b/test/v1/default-widget-legacy.html
similarity index 100%
rename from test/default-widget-legacy.html
rename to test/v1/default-widget-legacy.html
diff --git a/test/default-widget.html b/test/v1/default-widget.html
similarity index 100%
rename from test/default-widget.html
rename to test/v1/default-widget.html
diff --git a/test/expose-api-to-iframe.html b/test/v1/expose-api-to-iframe.html
similarity index 100%
rename from test/expose-api-to-iframe.html
rename to test/v1/expose-api-to-iframe.html
diff --git a/test/giving-widget-anonymous.html b/test/v1/giving-widget-anonymous.html
similarity index 100%
rename from test/giving-widget-anonymous.html
rename to test/v1/giving-widget-anonymous.html
diff --git a/test/giving-widget-legacy.html b/test/v1/giving-widget-legacy.html
similarity index 100%
rename from test/giving-widget-legacy.html
rename to test/v1/giving-widget-legacy.html
diff --git a/test/giving-widget.html b/test/v1/giving-widget.html
similarity index 100%
rename from test/giving-widget.html
rename to test/v1/giving-widget.html
diff --git a/test/test_custom-widget-legacy.js b/test/v1/test_custom-widget-legacy.js
similarity index 74%
rename from test/test_custom-widget-legacy.js
rename to test/v1/test_custom-widget-legacy.js
index 3c2da21..112bb58 100644
--- a/test/test_custom-widget-legacy.js
+++ b/test/v1/test_custom-widget-legacy.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'custom-widget-legacy: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/custom-widget-legacy.html')
+    'v1 custom-widget-legacy: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/custom-widget-legacy.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'custom-widget-legacy: it should fill the standard values': function(test) {
-        test.open('http://localhost:9537/test/custom-widget-legacy.html')
+    'v1 custom-widget-legacy: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v1/custom-widget-legacy.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_custom-widget.js b/test/v1/test_custom-widget.js
similarity index 76%
rename from test/test_custom-widget.js
rename to test/v1/test_custom-widget.js
index f7c206c..7037905 100644
--- a/test/test_custom-widget.js
+++ b/test/v1/test_custom-widget.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'custom-widget: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/custom-widget.html')
+    'v1 custom-widget: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/custom-widget.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'custom-widget: it should fill the standard values': function(test) {
-        test.open('http://localhost:9537/test/custom-widget.html')
+    'v1 custom-widget: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v1/custom-widget.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_default-widget-anonymous.js b/test/v1/test_default-widget-anonymous.js
similarity index 69%
rename from test/test_default-widget-anonymous.js
rename to test/v1/test_default-widget-anonymous.js
index feae273..1a80646 100644
--- a/test/test_default-widget-anonymous.js
+++ b/test/v1/test_default-widget-anonymous.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'default-widget-anonymous: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/default-widget-anonymous.html')
+    'v1 default-widget-anonymous: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/default-widget-anonymous.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'default-widget-anonymous: it should show anonymous receiving': function(test) {
-        test.open('http://localhost:9537/test/default-widget-anonymous.html')
+    'v1 default-widget-anonymous: it should show anonymous receiving': function(test) {
+        test.open('http://localhost:9537/test/v1/default-widget-anonymous.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_default-widget-legacy.js b/test/v1/test_default-widget-legacy.js
similarity index 73%
rename from test/test_default-widget-legacy.js
rename to test/v1/test_default-widget-legacy.js
index e4452dd..7227aa9 100644
--- a/test/test_default-widget-legacy.js
+++ b/test/v1/test_default-widget-legacy.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'default-widget-legacy: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/default-widget-legacy.html')
+    'v1 default-widget-legacy: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/default-widget-legacy.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'default-widget-legacy: it should fill the standard values': function(test) {
-        test.open('http://localhost:9537/test/default-widget-legacy.html')
+    'v1 default-widget-legacy: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v1/default-widget-legacy.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_default-widget.js b/test/v1/test_default-widget.js
similarity index 75%
rename from test/test_default-widget.js
rename to test/v1/test_default-widget.js
index 8476243..6d94566 100644
--- a/test/test_default-widget.js
+++ b/test/v1/test_default-widget.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'default-widget: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/default-widget.html')
+    'v1 default-widget: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/default-widget.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'default-widget: it should fill the standard values': function(test) {
-        test.open('http://localhost:9537/test/default-widget.html')
+    'v1 default-widget: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v1/default-widget.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_expose-api-to-iframe.js b/test/v1/test_expose-api-to-iframe.js
similarity index 71%
rename from test/test_expose-api-to-iframe.js
rename to test/v1/test_expose-api-to-iframe.js
index 8afdee9..2fc9b42 100644
--- a/test/test_expose-api-to-iframe.js
+++ b/test/v1/test_expose-api-to-iframe.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'expose-api-to-iframe: widget should have Gratipay defined': function(test) {
-        test.open('http://localhost:9537/test/expose-api-to-iframe.html')
+    'v1 expose-api-to-iframe: widget should have Gratipay defined': function(test) {
+        test.open('http://localhost:9537/test/v1/expose-api-to-iframe.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_giving-widget-anonymous.js b/test/v1/test_giving-widget-anonymous.js
similarity index 69%
rename from test/test_giving-widget-anonymous.js
rename to test/v1/test_giving-widget-anonymous.js
index b4649e4..aeac81a 100644
--- a/test/test_giving-widget-anonymous.js
+++ b/test/v1/test_giving-widget-anonymous.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'giving-widget-anonymous: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/giving-widget-anonymous.html')
+    'v1 giving-widget-anonymous: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/giving-widget-anonymous.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'giving-widget-anonymous: it should show anonymous giving': function(test) {
-        test.open('http://localhost:9537/test/giving-widget-anonymous.html')
+    'v1 giving-widget-anonymous: it should show anonymous giving': function(test) {
+        test.open('http://localhost:9537/test/v1/giving-widget-anonymous.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_giving-widget-legacy.js b/test/v1/test_giving-widget-legacy.js
similarity index 73%
rename from test/test_giving-widget-legacy.js
rename to test/v1/test_giving-widget-legacy.js
index 97dd371..25acdd4 100644
--- a/test/test_giving-widget-legacy.js
+++ b/test/v1/test_giving-widget-legacy.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'giving-widget-legacy: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/giving-widget-legacy.html')
+    'v1 giving-widget-legacy: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/giving-widget-legacy.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'giving-widget-legacy: it should fill the standard values': function(test) {
-        test.open('http://localhost:9537/test/giving-widget-legacy.html')
+    'v1 giving-widget-legacy: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v1/giving-widget-legacy.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/test_giving-widget.js b/test/v1/test_giving-widget.js
similarity index 75%
rename from test/test_giving-widget.js
rename to test/v1/test_giving-widget.js
index 847c681..af5cba4 100644
--- a/test/test_giving-widget.js
+++ b/test/v1/test_giving-widget.js
@@ -1,7 +1,7 @@
 module.exports = {
 
-    'giving-widget: readystatus should be ready': function(test) {
-        test.open('http://localhost:9537/test/giving-widget.html')
+    'v1 giving-widget: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v1/giving-widget.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
@@ -9,8 +9,8 @@ module.exports = {
             .done();
     },
 
-    'giving-widget: it should fill the standard values': function(test) {
-        test.open('http://localhost:9537/test/giving-widget.html')
+    'v1 giving-widget: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v1/giving-widget.html')
             .waitFor(function() {
                 return !!document.querySelector('[data-gratipay-readystatus="ready"]');
             }, [], 2000)
diff --git a/test/v2/custom-widget.html b/test/v2/custom-widget.html
new file mode 100644
index 0000000..4e9ebba
--- /dev/null
+++ b/test/v2/custom-widget.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<script>grtpAPI = '/lib/v2/'</script>
+<script>gratipayURI = '/test/gratipay.com/'</script>
+
+<body>
+    <div data-gratipay-teamslug="gratipay" data-gratipay-widget="custom">
+        Team slug: <span class="gratipay-slug"></span>
+        <a class="gratipay-profile-link">profile link</a><br>
+        Receiving: <span class="gratipay-receiving"></span><br>
+        <a class="gratipay-link">gratipay &lt;3</a>
+    </div>
+    <script src="/lib/v2.js" async></script>
+</body>
diff --git a/test/v2/default-widget.html b/test/v2/default-widget.html
new file mode 100644
index 0000000..2f80a43
--- /dev/null
+++ b/test/v2/default-widget.html
@@ -0,0 +1,7 @@
+<!doctype html>
+<script>grtpAPI = '/lib/v2/'</script>
+<script>gratipayURI = '/test/gratipay.com/'</script>
+
+<body>
+    <script src="/lib/v2.js" data-gratipay-teamslug="gratipay" async></script>
+</body>
diff --git a/test/v2/test_custom-widget.js b/test/v2/test_custom-widget.js
new file mode 100644
index 0000000..25d103a
--- /dev/null
+++ b/test/v2/test_custom-widget.js
@@ -0,0 +1,22 @@
+module.exports = {
+
+    'v2 custom-widget: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v2/custom-widget.html')
+            .waitFor(function() {
+                return !!document.querySelector('[data-gratipay-readystatus="ready"]');
+            }, [], 2000)
+            .assert.attr('[data-gratipay-teamslug]', 'data-gratipay-readystatus').is('ready', 'readystatus should be ready')
+            .done();
+    },
+
+    'v2 custom-widget: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v2/custom-widget.html')
+            .waitFor(function() {
+                return !!document.querySelector('[data-gratipay-readystatus="ready"]');
+            }, [], 2000)
+            .assert.text('.gratipay-teamslug').is.not('', 'teamslug should not be empty')
+            .assert.text('.gratipay-receiving').is.not('', 'receiving should not be empty')
+            .done();
+    },
+
+};
diff --git a/test/v2/test_default-widget.js b/test/v2/test_default-widget.js
new file mode 100644
index 0000000..29125ad
--- /dev/null
+++ b/test/v2/test_default-widget.js
@@ -0,0 +1,25 @@
+module.exports = {
+
+    'v2 default-widget: readystatus should be ready': function(test) {
+        test.open('http://localhost:9537/test/v2/default-widget.html')
+            .waitFor(function() {
+                return !!document.querySelector('[data-gratipay-readystatus="ready"]');
+            }, [], 2000)
+            .assert.attr('[data-gratipay-teamslug]', 'data-gratipay-readystatus').is('ready', 'readystatus should be ready')
+            .done();
+    },
+
+    'v2 default-widget: it should fill the standard values': function(test) {
+        test.open('http://localhost:9537/test/v2/default-widget.html')
+            .waitFor(function() {
+                return !!document.querySelector('[data-gratipay-readystatus="ready"]');
+            }, [], 2000)
+            .assert.exists('iframe')
+            .toFrame('iframe')
+                .assert.exists('.gratipay-receiving')
+                .assert.text('.gratipay-receiving').is.not('', 'taking should not be empty')
+            .toParent()
+            .done();
+    },
+
+};