diff --git a/.travis.yml b/.travis.yml
index 0a7eb47..a991c74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ php:
 before_script: composer install
 script:
   - mkdir -p build/logs
-  - php vendor/bin/phpunit -c phpunit.xml.dist
+  - php vendor/bin/phpunit test
 after_script:
   - php vendor/bin/coveralls -v
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..ac87d1c
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,7 @@
+Copyright (c) 2012 Toopher, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 0e13260..7aed739 100644
--- a/README.md
+++ b/README.md
@@ -1,78 +1,101 @@
-# ToopherAPI PHP Client
+# ToopherPHP [![Build Status](https://travis-ci.org/toopher/toopher-php.png?branch=master)](https://travis-ci.org/toopher/toopher-php)
 
-[![Build
-Status](https://travis-ci.org/toopher/toopher-php.png?branch=master)](https://travis-ci.org/toopher/toopher-php)
+ToopherPHP is a Toopher API library that simplifies the task of interfacing with the Toopher API from PHP code.  This project includes all the dependency libraries and handles the required OAuth and JSON functionality so you can focus on just using the API.
 
-#### Introduction
-ToopherAPI PHP Client simplifies the task of interfacing with the Toopher API from PHP code.  This project includes all the dependency libraries and handles the required OAuth and JSON functionality so you can focus on just using the API.
+### PHP Version
+\>=5.3.0
 
-#### Learn the Toopher API
-Make sure you visit [http://dev.toopher.com](http://dev.toopher.com) to get acquainted with the Toopher API fundamentals.  The documentation there will tell you the details about the operations this API wrapper library provides.
+### Documentation
+Make sure you visit [https://dev.toopher.com](https://dev.toopher.com) to get acquainted with the Toopher API fundamentals.  The documentation there will tell you the details about the operations this API wrapper library provides.
 
-#### OAuth Authentication
+## ToopherApi Workflow
 
-The first step to accessing the Toopher API is to sign up for an account at the development portal [http://dev.toopher.com](http://dev.toopher.com) and create a "requester". When that process is complete, your requester is issued OAuth 1.0a credentials in the form of a consumer key and secret. Your key is used to identify your requester when Toopher interacts with your customers, and the secret is used to sign each request so that we know it is generated by you.  This library properly formats each request with your credentials automatically.
-
-#### The Toopher Two-Step
-Interacting with the Toopher web service involves two steps: pairing, and authenticating.
-
-##### Pair
-Before you can enhance your website's actions with Toopher, your customers will need to pair their phone's Toopher app with your website.  To do this, they generate a unique, nonsensical "pairing phrase" from within the app on their phone.  You will need to prompt them for a pairing phrase as part of the Toopher enrollment process.  Once you have a pairing phrase, just send it to the Toopher API along with your requester credentials and we'll return a pairing ID that you can use whenever you want to authenticate an action for that user.
-
-##### Authenticate
-You have complete control over what actions you want to authenticate using Toopher (for example: logging in, changing account information, making a purchase, etc.).  Just send us the user's pairing ID, a name for the terminal they're using, and a description of the action they're trying to perform and we'll make sure they actually want it to happen.
-
-#### Librarified
-This library makes it super simple to do the Toopher two-step.  Check it out:
+### Step 1: Pair
+Before you can enhance your website's actions with Toopher, your customers will need to pair their mobile device's Toopher app with your website.  To do this, they generate a unique pairing phrase from within the app on their mobile device.  You will need to prompt them for a pairing phrase as part of the Toopher enrollment process.  Once you have a pairing phrase, just send it to the Toopher web service along with your requester credentials and we'll return a pairing ID that you can use whenever you want to authenticate an action for that user.
 
 ```php
 require_once("toopher_api.php");
 
 // Create an API object using your credentials
-$toopherApi = new ToopherAPI($key, $secret);
+$toopherApi = new ToopherApi("<your consumer key>", "<your consumer secret>");
 
-// Step 1 - Pair with their phone's Toopher app
-$pairing = $toopherApi->pair("pairing phrase", "username@yourservice.com");
+// Step 1 - Pair with their mobile device's Toopher app
+$pairing = $toopherApi->pair("username@yourservice.com", "pairing phrase");
+```
+
+### Step 2: Authenticate
+You have complete control over what actions you want to authenticate using Toopher (logging in, changing account information, making a purchase, etc.).  Just send us the username or pairing ID and we'll make sure they actually want it to happen. You can also choose to provide the following optional parameters: terminal name, requester specified ID and action name (*default: "Log in"*).
 
+```php
 // Step 2 - Authenticate a log in
-$authStatus = $toopherApi->authenticate($pairingStatus['id'], "my computer");
+$authRequest = $toopherApi->authenticate("username", "my computer");
 
 // Once they've responded you can then check the status
-while($authStatus['pending']){
-    $authStatus = $toopherApi->getAuthenticationStatus($authStatus['id']);
-    sleep(1);
-}
-if($authStatus['granted']){
-    // Success!
-} else {
-    // user declined the authorization!
+$authRequest->refreshFromServer();
+if ($authRequest->pending == false && $authRequest->granted == true) {
+  // Success!
 }
 ```
 
-#### Dependencies
-Toopher manages dependencies with [composer](http://getcomposer.org).  To ensure all dependencies are up-to-date, execute the following command:
-```shell
-$ composer install
+## ToopherIframe Workflow
+
+### Step 1: Embed a request in an IFRAME
+1. Generate an authentication URL by providing a username.
+2. Display a webapage to your user that embeds this URL within an `<iframe>` element.
+
+```php
+require_once("toopher_api.php")
+
+// Create an API object using your credentials
+$iframeApi = new ToopherIframe("<your consumer key>", "<your consumer secret>");
+
+$authIframeUrl = $iframeApi->getAuthenticationUrl("username@yourservice.com");
+
+// Add an <iframe> element to your HTML:
+// <iframe id="toopher-iframe" src=authIframeUrl />
+```
+
+### Step 2: Validate the postback data
+
+The simplest way to validate the postback data is to call `isAuthenticationGranted` to check if the authentication request was granted.
+
+```php
+// Retrieve the postback data as a string from POST parameter 'iframe_postback_data'
+
+// Returns boolean indicating if authentication request was granted by user
+$authenticationRequestGranted = $iframeApi->isAuthenticationGranted(postback_data)
+
+if ($authenticationRequestGranted) {
+    // Success!
+}
 ```
-from the root directory the package (the same directory that this README is located in)
 
-#### Handling Errors
+### Handling Errors
 If any request runs into an error a `ToopherRequestException` will be thrown with more details on what went wrong.
 
-#### Example code
-Check out demo/toopher_demo.php for an example program that walks you through the whole process!  Simply execute the script as follows:
+### Demo
+Check out `demo/toopher_demo.php` for an example program that walks you through the whole process!  Simply run the command below:
 ```shell
 $ php demo/toopher_demo.php
 ```
-To avoid being prompted for your Toopher API key and secret, you can define them in the $TOOPHER_CONSUMER_KEY and $TOOPHER_CONSUMER_SECRET environment variables
 
-#### Tests
-To run all unit tests:
+## Contributing
+### Dependencies
+Toopher manages dependencies with [composer](http://getcomposer.org).  To ensure all dependencies are up-to-date run the command below from the root directory:
+```shell
+$ composer install
+```
+
+### Tests
+To run the tests enter:
 ```shell
-$ phpunit test/test_toopher_api.php
+$ phpunit test
 ```
-Note: `phpunit` may be found in `vendor/bin/php` so your test command
-would be
+*Note: `phpunit` may be found in `vendor/bin/php` so your test command
+would be:*
 ```shell
-$ vendor/bin/phpunit test/test_toopher_api.php
+$ vendor/bin/phpunit test
 ```
+
+## License
+ToopherPHP is licensed under the MIT License. See LICENSE.txt for the full text.
diff --git a/assets/js/toopher-web.js b/assets/js/toopher-web.js
new file mode 100644
index 0000000..deb2209
--- /dev/null
+++ b/assets/js/toopher-web.js
@@ -0,0 +1,43 @@
+(function(window, $){
+  var postToUrl = function (path, params, method){
+    method = method || 'POST';
+    var form = $('<form />').attr('method', method).attr('action', path);
+    for (var key in params){
+      if (params.hasOwnProperty(key)){
+        var hiddenField = $('<input />').attr('type', 'hidden').attr('name', key).attr('value', params[key]);
+        form.append(hiddenField);
+      }
+    }
+    $('body').append(form);
+    form.submit();
+  }
+
+  var handleMessage = function(e){
+    var msgData = JSON.parse(e.data);
+    if (msgData.status === 'toopher-api-complete'){
+      var iframe = $('#toopher_iframe');
+      var frameworkPostArgsJSON = iframe.attr('framework_post_args');
+      var frameworkPostArgs = {};
+      if(frameworkPostArgsJSON){
+        frameworkPostArgs = $.parseJSON(frameworkPostArgsJSON);
+      }
+      var postData = $.extend({}, msgData.payload, frameworkPostArgs);
+      var toopherData = {'toopher_iframe_data': $.param(postData)};
+
+      if(iframe.attr('use_ajax_postback')){
+      $.post(iframe.attr('toopher_postback'), toopherData)
+        .done(function(data){
+          data = $.parseJSON(data);
+        });
+      } else {
+        postToUrl(iframe.attr('toopher_postback'), toopherData, 'POST');
+      }
+    }
+  }
+
+  if (window.addEventListener) {
+    window.addEventListener('message', handleMessage, false);
+  } else {
+    window.attachEvent('onmessage', handleMessage);
+  }
+})(window, jQuery);
diff --git a/composer.json b/composer.json
index e59be01..c0f7bd1 100644
--- a/composer.json
+++ b/composer.json
@@ -22,12 +22,14 @@
   "require":{
     "php": ">=5.3.0",
     "ext-json": "*",
+    "vclayton/unpecl-oauth": "dev-master",
     "pear-pear.php.net/HTTP_Request2": ">=2.1.1",
     "pear-pear.php.net/HTTP_OAuth": ">=0.2.3"
   },
   "require-dev" : {
     "phpunit/phpunit": "3.7.*",
-    "satooshi/php-coveralls": "dev-master"
+    "satooshi/php-coveralls": "dev-master",
+    "rhumsaa/uuid": ">=2.8"
   },
   "autoload":{
     "classmap": ["lib"]
diff --git a/composer.lock b/composer.lock
index 6f1821c..4f50008 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,16 +1,17 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
     ],
-    "hash": "53b461e8bceb01a377f1e35459f3e770",
+    "hash": "584d9805081fa7f847fac815ad93ecea",
     "packages": [
         {
             "name": "pear-pear.php.net/Archive_Tar",
-            "version": "1.3.11",
+            "version": "1.3.14",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Archive_Tar-1.3.11.tgz",
+                "url": "http://pear.php.net/get/Archive_Tar-1.3.14.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -18,7 +19,7 @@
                 "php": ">=4.3.0.0"
             },
             "replace": {
-                "pear-pear/archive_tar": "== 1.3.11.0"
+                "pear-pear/archive_tar": "== 1.3.14.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -29,22 +30,25 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "New BSD\n License"
+            ],
             "description": "This class provides handling of tar files in PHP.\nIt supports creating, listing, extracting and adding to tar files.\nGzip support is available if PHP has the zlib extension built-in or\nloaded. Bz2 compression is also supported with the bz2 extension loaded."
         },
         {
             "name": "pear-pear.php.net/Console_Getopt",
-            "version": "1.3.1",
+            "version": "1.4.0",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Console_Getopt-1.3.1.tgz",
+                "url": "http://pear.php.net/get/Console_Getopt-1.4.0.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
-                "php": ">=4.3.0.0"
+                "php": ">=5.4.0.0"
             },
             "replace": {
-                "pear-pear/console_getopt": "== 1.3.1.0"
+                "pear-pear/console_getopt": "== 1.4.0.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -55,6 +59,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "PHP License"
+            ],
             "description": "This is a PHP implementation of &quot;getopt&quot; supporting both\nshort and long options."
         },
         {
@@ -118,10 +125,10 @@
         },
         {
             "name": "pear-pear.php.net/Net_URL2",
-            "version": "2.0.5",
+            "version": "2.1.1",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/Net_URL2-2.0.5.tgz",
+                "url": "http://pear.php.net/get/Net_URL2-2.1.1.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -129,7 +136,7 @@
                 "php": ">=5.1.4.0"
             },
             "replace": {
-                "pear-pear/net_url2": "== 2.0.5.0"
+                "pear-pear/net_url2": "== 2.1.1.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -140,21 +147,24 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "BSD-3-Clause"
+            ],
             "description": "Provides parsing of URLs into their constituent parts (scheme, host, path etc.), URL generation, and resolving of\n    relative URLs."
         },
         {
             "name": "pear-pear.php.net/PEAR",
-            "version": "1.9.4",
+            "version": "1.9.5",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/PEAR-1.9.4.tgz",
+                "url": "http://pear.php.net/get/PEAR-1.9.5.tgz",
                 "reference": null,
                 "shasum": null
             },
             "require": {
                 "ext-pcre": "*",
                 "ext-xml": "*",
-                "pear-pear.php.net/archive_tar": ">=1.3.7.0",
+                "pear-pear.php.net/archive_tar": ">=1.3.11.0",
                 "pear-pear.php.net/console_getopt": ">=1.2.0.0",
                 "pear-pear.php.net/structures_graph": ">=1.0.2.0",
                 "pear-pear.php.net/xml_util": ">=1.2.0.0",
@@ -165,7 +175,7 @@
                 "pear-pear.php.net/pear_frontend_web": "<=0.4.0.0"
             },
             "replace": {
-                "pear-pear/pear": "== 1.9.4.0"
+                "pear-pear/pear": "== 1.9.5.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -176,6 +186,9 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "New BSD License"
+            ],
             "description": "The PEAR package contains:\n * the PEAR installer, for creating, distributing\n   and installing packages\n * the PEAR_Exception PHP5 error handling mechanism\n * the PEAR_ErrorStack advanced error handling mechanism\n * the PEAR_Error error handling mechanism\n * the OS_Guess class for retrieving info about the OS\n   where PHP is running on\n * the System class for quick handling of common operations\n   with files and directories\n * the PEAR base class\n  Features in a nutshell:\n  * full support for channels\n  * pre-download dependency validation\n  * new package.xml 2.0 format allows tremendous flexibility while maintaining BC\n  * support for optional dependency groups and limited support for sub-packaging\n  * robust dependency support\n  * full dependency validation on uninstall\n  * remote install for hosts with only ftp access - no more problems with\n    restricted host installation\n  * full support for mirroring\n  * support for bundling several packages into a single tarball\n  * support for static dependencies on a url-based package\n  * support for custom file roles and installation tasks"
         },
         {
@@ -206,10 +219,10 @@
         },
         {
             "name": "pear-pear.php.net/XML_Util",
-            "version": "1.2.1",
+            "version": "1.2.3",
             "dist": {
                 "type": "file",
-                "url": "http://pear.php.net/get/XML_Util-1.2.1.tgz",
+                "url": "http://pear.php.net/get/XML_Util-1.2.3.tgz",
                 "reference": null,
                 "shasum": null
             },
@@ -218,7 +231,7 @@
                 "php": ">=4.3.0.0"
             },
             "replace": {
-                "pear-pear/xml_util": "== 1.2.1.0"
+                "pear-pear/xml_util": "== 1.2.3.0"
             },
             "type": "pear-library",
             "autoload": {
@@ -229,22 +242,66 @@
             "include-path": [
                 "/"
             ],
+            "license": [
+                "BSD License"
+            ],
             "description": "Selection of methods that are often needed when working with XML documents.  Functionality includes creating of attribute lists from arrays, creation of tags, validation of XML names and more."
+        },
+        {
+            "name": "vclayton/unpecl-oauth",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/vclayton/unpecl-oauth.git",
+                "reference": "4ecff17a564d50fc874f86729d611a46088d42cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/vclayton/unpecl-oauth/zipball/4ecff17a564d50fc874f86729d611a46088d42cf",
+                "reference": "4ecff17a564d50fc874f86729d611a46088d42cf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "ext-hash": "*",
+                "ext-openssl": "*",
+                "php": ">=5.1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Native PHP drop-in replacement for the PECL OAuth extension",
+            "homepage": "https://github.com/vclayton/unpecl-oauth",
+            "keywords": [
+                "oauth",
+                "pecl"
+            ],
+            "time": "2014-09-30 13:23:17"
         }
     ],
     "packages-dev": [
         {
             "name": "guzzle/guzzle",
-            "version": "v3.9.1",
+            "version": "v3.9.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle3.git",
-                "reference": "92d9934f2fca1da15178c91239576ae26e505e60"
+                "reference": "54991459675c1a2924122afbb0e5609ade581155"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/92d9934f2fca1da15178c91239576ae26e505e60",
-                "reference": "92d9934f2fca1da15178c91239576ae26e505e60",
+                "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/54991459675c1a2924122afbb0e5609ade581155",
+                "reference": "54991459675c1a2924122afbb0e5609ade581155",
                 "shasum": ""
             },
             "require": {
@@ -288,7 +345,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.8-dev"
+                    "dev-master": "3.9-dev"
                 }
             },
             "autoload": {
@@ -323,27 +380,27 @@
                 "rest",
                 "web service"
             ],
-            "time": "2014-05-07 17:04:22"
+            "time": "2014-08-11 04:32:36"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "1.2.17",
+            "version": "1.2.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34"
+                "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6ef2bf3a1c47eca07ea95f0d8a902a6340390b34",
-                "reference": "6ef2bf3a1c47eca07ea95f0d8a902a6340390b34",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b",
+                "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3",
                 "phpunit/php-file-iterator": ">=1.3.0@stable",
                 "phpunit/php-text-template": ">=1.2.0@stable",
-                "phpunit/php-token-stream": ">=1.1.3@stable"
+                "phpunit/php-token-stream": ">=1.1.3,<1.3.0"
             },
             "require-dev": {
                 "phpunit/phpunit": "3.7.*@dev"
@@ -384,7 +441,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-03-28 10:53:45"
+            "time": "2014-09-02 10:13:14"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -571,16 +628,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "3.7.37",
+            "version": "3.7.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc"
+                "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
-                "reference": "ae6cefd7cc84586a5ef27e04bae11ee940ec63dc",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6",
+                "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6",
                 "shasum": ""
             },
             "require": {
@@ -640,20 +697,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2014-04-30 12:24:19"
+            "time": "2014-10-17 09:04:17"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
             "version": "1.2.3",
             "source": {
                 "type": "git",
-                "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "1.2.3"
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip",
-                "reference": "1.2.3",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875",
+                "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875",
                 "shasum": ""
             },
             "require": {
@@ -729,24 +786,90 @@
             ],
             "time": "2012-12-21 11:40:51"
         },
+        {
+            "name": "rhumsaa/uuid",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ramsey/uuid.git",
+                "reference": "cca98c652cac412c9c2f109c69e5532f313435fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/cca98c652cac412c9c2f109c69e5532f313435fc",
+                "reference": "cca98c652cac412c9c2f109c69e5532f313435fc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "doctrine/dbal": ">=2.3",
+                "moontoast/math": "~1.1",
+                "phpunit/phpunit": "~4.1",
+                "satooshi/php-coveralls": "~0.6",
+                "symfony/console": "~2.3"
+            },
+            "suggest": {
+                "doctrine/dbal": "Allow the use of a UUID as doctrine field type.",
+                "moontoast/math": "Support for converting UUID to 128-bit integer (in string form).",
+                "symfony/console": "Support for use of the bin/uuid command line tool."
+            },
+            "bin": [
+                "bin/uuid"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Rhumsaa\\Uuid\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marijn Huizendveld",
+                    "email": "marijn.huizendveld@gmail.com"
+                },
+                {
+                    "name": "Ben Ramsey",
+                    "homepage": "http://benramsey.com"
+                }
+            ],
+            "description": "A PHP 5.3+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID).",
+            "homepage": "https://github.com/ramsey/uuid",
+            "keywords": [
+                "guid",
+                "identifier",
+                "uuid"
+            ],
+            "time": "2014-11-09 18:42:56"
+        },
         {
             "name": "satooshi/php-coveralls",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/satooshi/php-coveralls.git",
-                "reference": "b7271847c84d160f5b0aae83e45c225e8ffc96f4"
+                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/b7271847c84d160f5b0aae83e45c225e8ffc96f4",
-                "reference": "b7271847c84d160f5b0aae83e45c225e8ffc96f4",
+                "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70",
+                "reference": "2fbf803803d179ab1082807308a67bbd5a760c70",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-simplexml": "*",
-                "guzzle/guzzle": ">=3.0",
+                "guzzle/guzzle": ">=2.7",
                 "php": ">=5.3",
                 "psr/log": "1.0.0",
                 "symfony/config": ">=2.0",
@@ -756,7 +879,7 @@
             },
             "require-dev": {
                 "apigen/apigen": "2.8.*@stable",
-                "pdepend/pdepend": "dev-master",
+                "pdepend/pdepend": "dev-master as 2.0.0",
                 "phpmd/phpmd": "dev-master",
                 "phpunit/php-invoker": ">=1.1.0,<1.2.0",
                 "phpunit/phpunit": "3.7.*@stable",
@@ -802,21 +925,21 @@
                 "github",
                 "test"
             ],
-            "time": "2014-05-14 13:09:37"
+            "time": "2014-11-11 15:35:34"
         },
         {
             "name": "symfony/config",
-            "version": "v2.4.5",
+            "version": "v2.6.4",
             "target-dir": "Symfony/Component/Config",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config.git",
-                "reference": "2effc67af6f21a0d267210b72d0b0b691d113528"
+                "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/2effc67af6f21a0d267210b72d0b0b691d113528",
-                "reference": "2effc67af6f21a0d267210b72d0b0b691d113528",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
+                "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
                 "shasum": ""
             },
             "require": {
@@ -826,7 +949,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -839,49 +962,51 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Config Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-22 08:11:06"
+            "time": "2015-01-21 20:57:55"
         },
         {
             "name": "symfony/console",
-            "version": "v2.4.5",
+            "version": "v2.6.4",
             "target-dir": "Symfony/Component/Console",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Console.git",
-                "reference": "24f723436e62598c9dddee2a8573d6992504dc5d"
+                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/24f723436e62598c9dddee2a8573d6992504dc5d",
-                "reference": "24f723436e62598c9dddee2a8573d6992504dc5d",
+                "url": "https://api.github.com/repos/symfony/Console/zipball/e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
+                "reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "symfony/event-dispatcher": "~2.1"
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1",
+                "symfony/process": "~2.1"
             },
             "suggest": {
-                "symfony/event-dispatcher": ""
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -894,41 +1019,43 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Console Component",
             "homepage": "http://symfony.com",
-            "time": "2014-05-14 21:48:29"
+            "time": "2015-01-25 04:39:26"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.4.5",
+            "version": "v2.6.4",
             "target-dir": "Symfony/Component/EventDispatcher",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "e539602e5455aa086c0e81e604745af7789e4d8a"
+                "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e539602e5455aa086c0e81e604745af7789e4d8a",
-                "reference": "e539602e5455aa086c0e81e604745af7789e4d8a",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f75989f3ab2743a82fe0b03ded2598a2b1546813",
+                "reference": "f75989f3ab2743a82fe0b03ded2598a2b1546813",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "symfony/dependency-injection": "~2.0"
+                "psr/log": "~1.0",
+                "symfony/config": "~2.0,>=2.0.5",
+                "symfony/dependency-injection": "~2.6",
+                "symfony/expression-language": "~2.6",
+                "symfony/stopwatch": "~2.3"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -937,7 +1064,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -950,34 +1077,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:34:31"
+            "time": "2015-02-01 16:10:57"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v2.4.5",
+            "version": "v2.6.4",
             "target-dir": "Symfony/Component/Filesystem",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4"
+                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a3af8294bcce4a7c1b2892363b0c9d8109affad4",
-                "reference": "a3af8294bcce4a7c1b2892363b0c9d8109affad4",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
+                "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
                 "shasum": ""
             },
             "require": {
@@ -986,7 +1111,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -999,34 +1124,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-16 10:34:31"
+            "time": "2015-01-03 21:13:09"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v2.4.5",
+            "version": "v2.6.4",
             "target-dir": "Symfony/Component/Stopwatch",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "343bcc0360f2c22f371884b8f6a9fee8d1aa431a"
+                "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/343bcc0360f2c22f371884b8f6a9fee8d1aa431a",
-                "reference": "343bcc0360f2c22f371884b8f6a9fee8d1aa431a",
+                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/e8da5286132ba75ce4b4275fbf0f4cd369bfd71c",
+                "reference": "e8da5286132ba75ce4b4275fbf0f4cd369bfd71c",
                 "shasum": ""
             },
             "require": {
@@ -1035,7 +1158,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -1048,34 +1171,32 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Stopwatch Component",
             "homepage": "http://symfony.com",
-            "time": "2014-04-18 20:37:09"
+            "time": "2015-01-03 08:01:59"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.4.5",
+            "version": "v2.6.4",
             "target-dir": "Symfony/Component/Yaml",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "fd22bb88c3a6f73c898b39bec185a9e211b06265"
+                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/fd22bb88c3a6f73c898b39bec185a9e211b06265",
-                "reference": "fd22bb88c3a6f73c898b39bec185a9e211b06265",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/60ed7751671113cf1ee7d7778e691642c2e9acd8",
+                "reference": "60ed7751671113cf1ee7d7778e691642c2e9acd8",
                 "shasum": ""
             },
             "require": {
@@ -1084,7 +1205,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.6-dev"
                 }
             },
             "autoload": {
@@ -1097,34 +1218,31 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
                 {
                     "name": "Symfony Community",
                     "homepage": "http://symfony.com/contributors"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
                 }
             ],
             "description": "Symfony Yaml Component",
             "homepage": "http://symfony.com",
-            "time": "2014-05-12 09:27:48"
+            "time": "2015-01-25 04:39:26"
         }
     ],
-    "aliases": [
-
-    ],
+    "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
+        "vclayton/unpecl-oauth": 20,
         "satooshi/php-coveralls": 20
     },
+    "prefer-stable": false,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.3.0",
         "ext-json": "*"
     },
-    "platform-dev": [
-
-    ]
+    "platform-dev": []
 }
diff --git a/demo/bootstrap.php b/demo/bootstrap.php
index c1c1e80..8ef7e4a 100644
--- a/demo/bootstrap.php
+++ b/demo/bootstrap.php
@@ -1,5 +1,11 @@
 <?php
 $base = realpath(dirname(__FILE__) . '/..');
-require_once "$base/lib/toopher_api.php";
+require_once "$base/lib/ToopherApi.php";
+require_once "$base/lib/ToopherIframe.php";
+require_once "$base/lib/Pairing.php";
+require_once "$base/lib/AuthenticationRequest.php";
+require_once "$base/lib/User.php";
+require_once "$base/lib/UserTerminal.php";
+require_once "$base/lib/Action.php";
 require_once "$base/vendor/autoload.php";
 ?>
diff --git a/demo/toopher_demo.php b/demo/toopher_demo.php
index 367c5a4..2576211 100644
--- a/demo/toopher_demo.php
+++ b/demo/toopher_demo.php
@@ -22,52 +22,154 @@
 SOFTWARE.
 */
 
-require_once("bootstrap.php");
+require_once('bootstrap.php');
 
 $stdin = fopen('php://stdin', 'r');
 
-$key = getenv('TOOPHER_CONSUMER_KEY');
-$secret = getenv('TOOPHER_CONSUMER_SECRET');
-if(empty($key) || empty($secret)){
-    echo("enter consumer credentials (set environment variables to prevent prompting):\n");
-    echo("TOOPHER_CONSUMER_KEY=");
-    $key = rtrim(fgets($stdin));
-    echo("TOOPHER_CONSUMER_SECRET=");
-    $secret = rtrim(fgets($stdin));
+const DEFAULT_USERNAME = 'demo@toopher.com';
+const DEFAULT_TERMINAL_NAME = 'my computer';
+
+function printHorizontalLine($character = '-')
+{
+    echo(str_repeat($character, 40) . "\n");
+}
+
+function printTextWithUnderline($text, $character = '-')
+{
+    echo ("\n" . $text . "\n");
+    printHorizontalLine($character);
 }
 
-echo ("using key=$key, secret=$secret\n");
-$toopher = new ToopherAPI($key, $secret);
+function initializeApi()
+{
+    global $stdin;
 
-echo("\nSTEP 1: Pair device\n");
-echo("enter pairing phrase:");
-$phrase = rtrim(fgets($stdin));
-echo("enter user name:");
-$userName = rtrim(fgets($stdin));
+    $key = getenv('TOOPHER_CONSUMER_KEY');
+    $secret = getenv('TOOPHER_CONSUMER_SECRET');
 
-$pairing = $toopher->pair($phrase, $userName);
+    if(empty($key) || empty($secret)){
+        echo("Enter your requester credentials (from https://dev.toopher.com).\n");
+        echo("Hint: Set the TOOPHER_CONSUMER_SECRET and TOOPHER_CONSUMER_SECRET environment variables to avoid this prompt.\n");
+        echo('TOOPHER_CONSUMER_KEY:');
+        $key = rtrim(fgets($stdin));
+        echo('TOOPHER_CONSUMER_SECRET:');
+        $secret = rtrim(fgets($stdin));
+    }
 
-while(!$pairing['enabled']){
-    echo("waiting for authorization...\n");
-    sleep(1);
-    $pairing = $toopher->getPairingStatus($pairing['id']);
+    return new ToopherApi($key, $secret, getenv('TOOPHER_BASE_URL'));
 }
 
-echo("paired successfully!\n");
-echo("\nSTEP 2: Authenticate login\n");
-echo("enter terminal name:");
-$terminalName = rtrim(fgets($stdin));
-echo("enter action name, or [ENTER] for none:");
-while(true){
-    $action = rtrim(fgets($stdin));
-    echo("sending authentication request...\n");
-    $auth = $toopher->authenticate($pairing['id'], $terminalName, $action);
-    while($auth['pending']){
-        echo("waiting for authentication...\n");
-        sleep(1);
-        $auth = $toopher->getAuthenticationStatus($auth['id']);
+function pairDeviceWithToopher($toopher)
+{
+    global $stdin;
+
+    while(true) {
+        printTextWithUnderline('STEP 1: Pair requester with phone');
+        echo("Pairing phrases are generated on the mobile app\n");
+
+        do {
+            echo('Enter pairing phrase: ');
+            $phrase = rtrim(fgets($stdin));
+        } while (empty($phrase));
+
+
+        echo(sprintf('Enter a username for this pairing [%s]: ', DEFAULT_USERNAME));
+        $userName = rtrim(fgets($stdin));
+
+        if (empty($userName)) {
+            $userName = DEFAULT_USERNAME;
+        }
+
+        try {
+            $pairing = $toopher->pair($userName, $phrase);
+            break;
+        } catch (Exception $e) {
+            echo (sprintf("The pairing phrase was not accepted (Reason: %s) \n", $e->getMessage()));
+        }
     }
 
-    echo("Successfully authorized action '$action'.  Enter another action to authorize again, or [Ctrl+C] to exit:");
+    while(true) {
+        echo('Authorize pairing on phone and then press return to continue.');
+        rtrim(fgets($stdin));
+        echo("\nChecking status of pairing request...\n");
+
+        try {
+            $pairing->refreshFromServer();
+            if ($pairing->pending) {
+                echo("The pairing has not been authorized by the phone yet.\n");
+            } elseif ($pairing->enabled) {
+                echo("Pairing complete\n");
+                return $pairing;
+            } else {
+                echo("The pairing has been denied.\n");
+                break;
+            }
+        } catch (Exception $e) {
+            echo (sprintf("Could not check pairing status (Reason: %s)\n", $e->getMessage()));
+        }
+    }
 }
+
+function authenticateWithToopher($pairing, $toopher)
+{
+    global $stdin;
+
+    while(true) {
+        printTextWithUnderline('STEP 2: Authenticate log in');
+
+        echo(sprintf('Enter a terminal name for this authentication request [%s]: ', DEFAULT_TERMINAL_NAME));
+        $terminalName = rtrim(fgets($stdin));
+
+        if (empty($terminalName)) {
+            $terminalName = DEFAULT_TERMINAL_NAME;
+        }
+
+        echo("Sending authentication request...\n");
+        try {
+            $auth = $toopher->authenticate($pairing->user->name, $terminalName);
+        } catch (Exception $e) {
+            echo (sprintf('Error initiating authentication (Reason: %s)', $e->getMessage()));
+            break;
+        }
+
+        while(true) {
+            echo ('Respond to authentication request on phone and then press return to continue.');
+            rtrim(fgets($stdin));
+            echo ("\nChecking status of authentication request...\n");
+
+            try {
+                $auth->refreshFromServer();
+            } catch (Exception $e) {
+                echo (sprintf('Could not check authentication status (Reason: %s)', $e->getMessage()));
+            }
+
+            if ($auth->pending) {
+                echo ("The authentication request has not received a response from the phone yet.\n");
+            } else {
+                $automation = $auth->automated ? 'automatically ' : '';
+                $result = $auth->granted ? 'granted' : 'denied';
+                echo ('The request was ' . $automation . $result . "!\n" );
+                break;
+            }
+        }
+        echo('Press return to authenticate again, or [Ctrl+C] to exit');
+        rtrim(fgets($stdin));
+    }
+}
+
+function demo()
+{
+    printTextWithUnderline('Toopher Library Demo', '=');
+
+    $toopher = initializeApi();
+
+    do {
+        $pairing = pairDeviceWithToopher($toopher);
+    } while (!$pairing);
+
+    authenticateWithToopher($pairing, $toopher);
+}
+
+demo()
+
 ?>
diff --git a/lib/Action.php b/lib/Action.php
new file mode 100644
index 0000000..8b4801c
--- /dev/null
+++ b/lib/Action.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class Action
+{
+    function __construct($jsonResponse)
+    {
+        try {
+            $this->id = $jsonResponse['id'];
+            $this->name = $jsonResponse['name'];
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse action from response: ' . $e->getMessage());
+        }
+    }
+
+    public function update($jsonResponse)
+    {
+        try {
+            $this->name = $jsonResponse['name'];
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse action from response: ' . $e->getMessage());
+        }
+    }
+}
+
+?>
diff --git a/lib/AuthenticationRequest.php b/lib/AuthenticationRequest.php
new file mode 100644
index 0000000..0ee78ca
--- /dev/null
+++ b/lib/AuthenticationRequest.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class AuthenticationRequest
+{
+    protected $api;
+
+    function __construct($jsonResponse, $api)
+    {
+        try {
+            $this->api = $api;
+            $this->id = $jsonResponse['id'];
+            $this->pending = $jsonResponse['pending'];
+            $this->granted = $jsonResponse['granted'];
+            $this->automated = $jsonResponse['automated'];
+            $this->reason_code = $jsonResponse['reason_code'];
+            $this->reason = $jsonResponse['reason'];
+            $this->terminal = new UserTerminal($jsonResponse['terminal'], $api);
+            $this->user = new User($jsonResponse['user'], $api);
+            $this->action = new Action($jsonResponse['action']);
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse authentication request from response: ' . $e->getMessage());
+        }
+    }
+
+    public function refreshFromServer()
+    {
+        $url = 'authentication_requests/' . $this->id;
+        $result = $this->api->advanced->raw->get($url);
+        $this->update($result);
+    }
+
+    public function grantWithOtp($otp, $kwargs = array())
+    {
+        $url = 'authentication_requests/' . $this->id . '/otp_auth';
+        $kwargs['otp'] = $otp;
+        $result = $this->api->advanced->raw->post($url, $kwargs);
+        $this->update($result);
+    }
+
+    private function update($jsonResponse)
+    {
+        try {
+            $this->pending = $jsonResponse['pending'];
+            $this->granted = $jsonResponse['granted'];
+            $this->automated = $jsonResponse['automated'];
+            $this->reason_code = $jsonResponse['reason_code'];
+            $this->reason = $jsonResponse['reason'];
+            $this->terminal->update($jsonResponse['terminal']);
+            $this->user->update($jsonResponse['user']);
+            $this->action->update($jsonResponse['action']);
+            $this->raw_respones = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse authentication request from response: ' . $e->getMessage());
+        }
+    }
+}
+
+?>
diff --git a/lib/Pairing.php b/lib/Pairing.php
new file mode 100644
index 0000000..7ad5023
--- /dev/null
+++ b/lib/Pairing.php
@@ -0,0 +1,91 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class Pairing
+{
+    protected $api;
+
+    function __construct($jsonResponse, $api)
+    {
+        try {
+            $this->api = $api;
+            $this->id = $jsonResponse['id'];
+            $this->enabled = $jsonResponse['enabled'];
+            $this->pending = $jsonResponse['pending'];
+            $this->user = new User($jsonResponse['user'], $api);
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse pairing from response: ' . $e->getMessage());
+        }
+
+    }
+
+    public function refreshFromServer()
+    {
+        $url = 'pairings/' . $this->id;
+        $result = $this->api->advanced->raw->get($url);
+        $this->update($result);
+    }
+
+    public function getResetLink($kwargs = array())
+    {
+        if(!array_key_exists('security_question', $kwargs)) {
+            $kwargs['security_question'] = NULL;
+        }
+        if(!array_key_exists('security_answer', $kwargs)) {
+            $kwargs['security_answer'] = NULL;
+        }
+        $url = 'pairings/' . $this->id . '/generate_reset_link';
+        $result = $this->api->advanced->raw->post($url, $kwargs);
+        return $result['url'];
+    }
+
+    public function emailResetLink($email, $kwargs = array())
+    {
+        $kwargs['reset_email'] = $email;
+        $url = 'pairings/' . $this->id . '/send_reset_link';
+        $this->api->advanced->raw->post($url, $kwargs);
+    }
+
+    public function getQrCodeImage()
+    {
+        $url = 'qr/pairings/' . $this->id;
+        return $this->api->advanced->raw->get_raw($url);
+    }
+
+    private function update($jsonResponse)
+    {
+        try {
+            $this->enabled = $jsonResponse['enabled'];
+            $this->pending = $jsonResponse['pending'];
+            $this->user->update($jsonResponse['user']);
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse pairing from response: ' . $e->getMessage());
+        }
+
+    }
+}
+
+?>
diff --git a/lib/ToopherApi.php b/lib/ToopherApi.php
new file mode 100644
index 0000000..622b8c6
--- /dev/null
+++ b/lib/ToopherApi.php
@@ -0,0 +1,311 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class ToopherRequestException extends Exception
+{
+}
+
+class ToopherApi
+{
+    const VERSION = '2.0.0';
+    const DEFAULT_BASE_URL = 'https://api.toopher.com/v1/';
+
+    protected $baseUrl;
+    protected $oauthConsumer;
+    protected $httpAdapter;
+
+    function __construct($key, $secret, $baseUrl = '', $httpAdapter = NULL)
+    {
+        if (empty($key)) {
+            throw new InvalidArgumentException('Toopher consumer key cannot be empty');
+        }
+        if (empty($secret)) {
+            throw new InvalidArgumentException('Toopher consumer secret cannot be empty');
+        }
+
+        $this->oauthConsumer = new HTTP_OAuth_Consumer($key, $secret);
+        $this->baseUrl = (!empty($baseUrl)) ? $baseUrl : ToopherApi::DEFAULT_BASE_URL;
+        $this->httpAdapter = (!is_null($httpAdapter)) ? $httpAdapter : new HTTP_Request2_Adapter_Curl();
+        $this->advanced = new AdvancedApiUsageFactory($key, $secret, $baseUrl, $httpAdapter, $this);
+    }
+
+    public function pair($username, $phraseOrNumber = NULL, $kwargs = array())
+    {
+        $params = array('user_name' => $username);
+        if (!empty($phraseOrNumber)) {
+            if (preg_match('/\d/', $phraseOrNumber, $match)) {
+                $url = 'pairings/create/sms';
+                $params['phone_number'] = $phraseOrNumber;
+            } else {
+                $url = 'pairings/create';
+                $params['pairing_phrase'] = $phraseOrNumber;
+            }
+        } else {
+            $url = 'pairings/create/qr';
+        }
+        $params = array_merge($params, $kwargs);
+        $result = $this->advanced->raw->post($url, $params);
+        return new Pairing($result, $this);
+    }
+
+    public function authenticate($pairingIdOrUsername, $terminalName = NULL, $requesterSpecifiedId = NULL, $actionName = NULL, $kwargs = array())
+    {
+        $url = 'authentication_requests/initiate';
+        $uuidPattern = '/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i';
+        if (preg_match($uuidPattern, $pairingIdOrUsername, $match)) {
+            $params = array('pairing_id' => $pairingIdOrUsername);
+        } else {
+            $params = array('user_name' => $pairingIdOrUsername);
+        }
+        if (!empty($actionName)) {
+            $params['action_name'] = $actionName;
+        }
+        if (!empty($terminalName)) {
+            $params['terminal_name'] = $terminalName;
+        }
+        if (!empty($requesterSpecifiedId)) {
+            $params['requester_specified_terminal_id'] = $requesterSpecifiedId;
+        }
+        $params = array_merge($params, $kwargs);
+        $result = $this->advanced->raw->post($url, $params);
+        return new AuthenticationRequest($result, $this);
+    }
+}
+
+abstract class ToopherObjectFactory
+{
+    protected $api;
+
+    function __construct($api)
+    {
+        $this->api = $api;
+    }
+}
+
+class AdvancedApiUsageFactory
+{
+    function __construct($key, $secret, $baseUrl, $httpAdapter, $api)
+    {
+        $this->raw = new ApiRawRequester($key, $secret, $baseUrl, $httpAdapter);
+        $this->pairings = new Pairings($api);
+        $this->authenticationRequests = new AuthenticationRequests($api);
+        $this->users = new Users($api);
+        $this->userTerminals = new UserTerminals($api);
+    }
+}
+
+class ApiRawRequester
+{
+    protected $oauthConsumer;
+    protected $baseUrl;
+    protected $httpAdapter;
+
+    function __construct($key, $secret, $baseUrl, $httpAdapter)
+    {
+        $this->oauthConsumer = new HTTP_OAuth_Consumer($key, $secret);
+        $this->baseUrl = (!empty($baseUrl)) ? $baseUrl : ToopherApi::DEFAULT_BASE_URL;
+        $this->httpAdapter = (!is_null($httpAdapter)) ? $httpAdapter : new HTTP_Request2_Adapter_Curl();
+    }
+
+    public function getOauthConsumer()
+    {
+        return $this->oauthConsumer;
+    }
+
+    public function post($endpoint, $parameters)
+    {
+        return $this->request('POST', $endpoint, $parameters);
+    }
+
+    public function get($endpoint, $parameters = array())
+    {
+        return $this->request('GET', $endpoint, $parameters);
+    }
+
+    public function get_raw($endpoint)
+    {
+        return $this->request('GET', $endpoint, array(), true);
+    }
+
+    private function request($method, $endpoint, $parameters = array(), $rawRequest = false)
+    {
+        $req = new HTTP_Request2();
+        $req->setAdapter($this->httpAdapter);
+        $req->setHeader(array('User-Agent' => sprintf('Toopher-PHP/%s (PHP %s)', ToopherApi::VERSION, phpversion())));
+        $req->setMethod($method);
+        $req->setUrl($this->baseUrl . $endpoint);
+        if (!is_null($parameters)) {
+            foreach($parameters as $key => $value) {
+                $req->addPostParameter($key, $value);
+            }
+        }
+        $oauthRequest = new HTTP_OAuth_Consumer_Request;
+        $oauthRequest->accept($req);
+        $this->oauthConsumer->accept($oauthRequest);
+        try {
+            $result = $this->oauthConsumer->sendRequest($this->baseUrl . $endpoint, $parameters, $method);
+        } catch (Exception $e) {
+            error_log($e->getMessage());
+            throw new ToopherRequestException('Error making Toopher API request', $e->getCode(), $e);
+        }
+
+        $resultBody = $result->getBody();
+        if ($result->getStatus() >= 400) {
+            error_log(sprintf('Toopher API call returned unexpected HTTP response: %d - %s', $result->getStatus(), $result->getReasonPhrase()));
+            if (empty($resultBody)) {
+                error_log('Empty response body');
+                throw new ToopherRequestException($result->getReasonPhrase(), $result->getStatus());
+            }
+
+            $err = json_decode($resultBody, true);
+            if ($err === NULL) {
+                $jsonError = $this->json_error_to_string(json_last_error());
+                if ($jsonError)
+                {
+                    error_log(sprintf('Error parsing response body JSON: %s', $jsonError));
+                    error_log(sprintf('Response body: %s', $result->getBody()));
+                    throw new ToopherRequestException(sprintf('JSON Parsing Error: %s', $jsonError));
+                }
+            } else {
+                if(array_key_exists('error_message', $err))
+                {
+                    throw new ToopherRequestException($err['error_message'], $err['error_code']);
+                }
+            }
+            throw new ToopherRequestException(sprintf('%s - %s', $result->getReasonPhrase(), $resultBody), $result->getStatus());
+        }
+
+        if ($rawRequest) {
+            return $resultBody;
+        } else {
+            $decoded = json_decode($resultBody, true);
+            if ($decoded === NULL) {
+                $jsonError = $this->json_error_to_string(json_last_error());
+                if ($jsonError)
+                {
+                    error_log(sprintf('Error parsing response body JSON: %s', $jsonError));
+                    error_log(sprintf('Response body: %s', $result->getBody()));
+                    throw new ToopherRequestException(sprintf('JSON Parsing Error: %s', $jsonError));
+                }
+            }
+            return $decoded;
+        }
+    }
+
+    private function json_error_to_string($jsonErrorCode)
+    {
+        switch ($jsonErrorCode) {
+            case JSON_ERROR_NONE:
+                return NULL;
+            case JSON_ERROR_DEPTH:
+                return 'Maximum stack depth exceeded';
+            case JSON_ERROR_STATE_MISMATCH:
+                return 'Underflow or the modes mismatch';
+            case JSON_ERROR_CTRL_CHAR:
+                return 'Unexpected control character found';
+            case JSON_ERROR_SYNTAX:
+                return 'Syntax error, malformed JSON';
+            case JSON_ERROR_UTF8:
+                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
+            default:
+                return 'Unknown error';
+        }
+    }
+}
+
+class Pairings extends ToopherObjectFactory
+{
+    public function getById($pairingId)
+    {
+        $url = 'pairings/' . $pairingId;
+        $result = $this->api->advanced->raw->get($url);
+        return new Pairing($result, $this->api);
+    }
+}
+
+class AuthenticationRequests extends ToopherObjectFactory
+{
+    public function getById($authenticationRequestId)
+    {
+        $url = 'authentication_requests/' . $authenticationRequestId;
+        $result = $this->api->advanced->raw->get($url);
+        return new AuthenticationRequest($result, $this->api);
+    }
+}
+
+class Users extends ToopherObjectFactory
+{
+    public function getById($userId)
+    {
+        $url = 'users/' . $userId;
+        $result = $this->api->advanced->raw->get($url);
+        return new User($result, $this->api);
+    }
+
+    public function getByName($username)
+    {
+        $url = 'users';
+        $params = array('user_name' => $username);
+        $users = $this->api->advanced->raw->get($url, $params);
+        if (sizeof($users) > 1) {
+            throw new ToopherRequestException(sprintf('Multiple users with name = %s', $username));
+        } elseif (empty($users)) {
+            throw new ToopherRequestException(sprintf('No users with name = %s', $username));
+        }
+        return new User(array_shift($users), $this->api);
+    }
+
+    public function create($username, $kwargs = array())
+    {
+        $url = 'users/create';
+        $kwargs ['name'] = $username;
+        $result = $this->api->advanced->raw->post($url, $kwargs);
+        return new User($result, $this->api);
+    }
+}
+
+class UserTerminals extends ToopherObjectFactory
+{
+    public function getById($userTerminalId)
+    {
+        $url = 'user_terminals/' . $userTerminalId;
+        $result = $this->api->advanced->raw->get($url);
+        return new UserTerminal($result, $this->api);
+    }
+
+    public function create($username, $terminalName, $requesterSpecifiedId, $kwargs = array())
+    {
+        $url = 'user_terminals/create';
+        $params = array(
+            'user_name' => $username,
+            'name' => $terminalName,
+            'name_extra' => $requesterSpecifiedId
+        );
+        $params = array_merge($params, $kwargs);
+        $result = $this->api->advanced->raw->post($url, $params);
+        return new UserTerminal($result, $this->api);
+    }
+}
+
+?>
diff --git a/lib/ToopherIframe.php b/lib/ToopherIframe.php
new file mode 100644
index 0000000..ef2266c
--- /dev/null
+++ b/lib/ToopherIframe.php
@@ -0,0 +1,318 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class SignatureValidationError extends Exception
+{
+}
+
+class ToopherIframe
+{
+    const VERSION = '2';
+    const TTL = '300';
+
+    function __construct($key, $secret, $baseUrl = 'https://api.toopher.com/v1/')
+    {
+        if (empty($key)) {
+            throw new InvalidArgumentException('Toopher consumer key cannot be empty');
+        }
+        if (empty($secret)) {
+            throw new InvalidArgumentException('Toopher consumer secret cannot be empty');
+        }
+
+        $this->consumerSecret = $secret;
+        $this->consumerKey = $key;
+        $this->oauthConsumer = new OAuth($key, $secret);
+        $this->baseUrl = $baseUrl;
+        $this->timestampOverride = NULL;
+        $this->nonceOverride = NULL;
+        $this->oauthVersion = '1.0';
+        $this->signatureMethod = 'HMAC-SHA1';
+    }
+
+    public function setTimestampOverride($timestampOverride)
+    {
+        $this->timestampOverride = $timestampOverride;
+    }
+
+    public function setNonceOverride($nonceOverride)
+    {
+        $this->nonceOverride = $nonceOverride;
+    }
+
+    private function getUnixTimestamp()
+    {
+        if (!is_null($this->timestampOverride)) {
+            return $this->timestampOverride;
+        } else {
+            return time();
+        }
+    }
+
+    public function getAuthenticationUrl($username, $resetEmail = '', $requestToken = '', $actionName = 'Log In', $requesterMetadata = '', $kwargs = array())
+    {
+        if (array_key_exists('ttl', $kwargs)) {
+            $ttl = $kwargs['ttl'];
+            unset($kwargs['ttl']);
+        } else {
+            $ttl = ToopherIframe::TTL;
+        }
+
+        $params = array(
+            'username' => $username,
+            'reset_email' => $resetEmail,
+            'action_name' => $actionName,
+            'session_token' => $requestToken,
+            'requester_metadata' => $requesterMetadata,
+        );
+        $params = array_merge($params, $kwargs);
+        return $this->getOauthSignedUrl($this->baseUrl . 'web/authenticate', $ttl, $params);
+    }
+
+    public function getUserManagementUrl($username, $resetEmail = '', $kwargs = array())
+    {
+        if (array_key_exists('ttl', $kwargs)) {
+            $ttl = $kwargs['ttl'];
+            unset($kwargs['ttl']);
+        } else {
+            $ttl = ToopherIframe::TTL;
+        }
+
+        $params = array(
+            'username' => $username,
+            'reset_email' => $resetEmail,
+        );
+        $params = array_merge($params, $kwargs);
+        return $this->getOauthSignedUrl($this->baseUrl . 'web/manage_user', $ttl, $params);
+    }
+
+    public function processPostback($data, $requestToken = '', $kwargs = array())
+    {
+        parse_str($data["toopher_iframe_data"], $toopherData);
+
+        if (array_key_exists('error_code', $toopherData)) {
+            throw new ToopherRequestException($toopherData['error_message'], $toopherData['error_code']);
+        } else {
+            $this->validateData($toopherData, $requestToken, $kwargs);
+            $api = new ToopherApi($this->consumerKey, $this->consumerSecret, $this->baseUrl);
+
+            switch ($toopherData['resource_type']) {
+                case 'authentication_request':
+                    return new AuthenticationRequest($this->createAuthenticationRequestArray($toopherData), $api);
+                case 'pairing':
+                    return new Pairing($this->createPairingArray($toopherData), $api);
+                case 'requester_user':
+                    return new User($this->createUserArray($toopherData), $api);
+                default:
+                    throw new ToopherRequestException('The postback resource type is not valid: ' . $toopherData['resource_type']);
+            }
+        }
+    }
+
+    public function isAuthenticationGranted($data, $requestToken = '', $kwargs = array())
+    {
+        try {
+            $authenticationRequest = $this->processPostback($data, $requestToken, $kwargs);
+            if (is_a($authenticationRequest, 'AuthenticationRequest')) {
+                return !$authenticationRequest->pending && $authenticationRequest->granted;
+            } else {
+                return false;
+            }
+        } catch (Exception $e) {
+            if ($e->getCode() == 704) {
+                error_log($e->getMessage());
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+    private function validateData($data, $requestToken, $kwargs)
+    {
+        try {
+            $this->checkForMissingKeys($data);
+            $this->verifySessionToken($data['session_token'], $requestToken);
+            $this->checkIfSignatureIsExpired($data['timestamp'], $kwargs);
+            $this->validateSignature($data);
+        } catch (Exception $e) {
+            throw new SignatureValidationError ('Exception while validating toopher signature: ' . $e);
+        }
+    }
+
+    private function checkForMissingKeys($data)
+    {
+        $missingKeys = array();
+        $requiredKeys = array('toopher_sig', 'timestamp', 'session_token');
+        foreach ($requiredKeys as &$key) {
+            if (!array_key_exists($key, $data)) {
+                $missingKeys[] = $key;
+            }
+        }
+        if (count($missingKeys) > 0) {
+            $keys = implode(',', $missingKeys);
+            throw new SignatureValidationError('Missing required keys: ' . $keys);
+        }
+    }
+
+    private function verifySessionToken($sessionToken, $requestToken)
+    {
+        if (!empty($requestToken) && $sessionToken != $requestToken) {
+            throw new SignatureValidationError('Session token does not match expected value');
+        }
+    }
+
+    private function checkIfSignatureIsExpired($timestamp, $kwargs)
+    {
+        if (array_key_exists('ttl', $kwargs)) {
+            $ttl = $kwargs['ttl'];
+            unset($kwargs['ttl']);
+        } else {
+            $ttl = 300;
+        }
+        $ttlValid = ($this->getUnixTimestamp() - $ttl) < $timestamp;
+        if (!$ttlValid) {
+            throw new SignatureValidationError('TTL Expired');
+        }
+    }
+
+    private function validateSignature($data)
+    {
+        $maybeSignature = $data['toopher_sig'];
+        unset($data['toopher_sig']);
+        $signatureValid = false;
+        try {
+            $computedSignature = $this->signature($this->consumerSecret, $data);
+            $signatureValid = $maybeSignature == $computedSignature;
+        } catch (Exception $e) {
+            throw new SignatureValidationError('Error while calculating signature: ' . $e->getMessage());
+        }
+
+        if (!$signatureValid) {
+            throw new SignatureValidationError('Computed signature does not match');
+        }
+    }
+
+    private function signature($secret, $parameters)
+    {
+        ksort($parameters);
+        $params = http_build_query($parameters);
+        $sig = hash_hmac('sha1', $params, $secret, true);
+        return base64_encode($sig);
+    }
+
+    private function createAuthenticationRequestArray($data)
+    {
+        return array(
+            'id' => $data['id'],
+            'pending'=>$data['pending'] == 'true',
+            'granted'=>$data['granted'] == 'true',
+            'automated'=>$data['automated'] == 'true',
+            'reason'=>$data['reason'],
+            'reason_code'=>$data['reason_code'],
+            'terminal'=>array(
+                'id'=>$data['terminal_id'],
+                'name'=>$data['terminal_name'],
+                'requester_specified_id'=>$data['terminal_requester_specified_id'],
+                'user'=>array(
+                    'id'=>$data['pairing_user_id'],
+                    'name'=>$data['user_name'],
+                    'toopher_authentication_enabled'=>$data['user_toopher_authentication_enabled'] == 'true'
+                )
+            ),
+            'user'=>array(
+                'id'=>$data['pairing_user_id'],
+                'name'=>$data['user_name'],
+                'toopher_authentication_enabled'=>$data['user_toopher_authentication_enabled'] == 'true'
+            ),
+            'action'=>array(
+                'id'=>$data['action_id'],
+                'name'=>$data['action_name']
+            )
+        );
+    }
+
+    private function createPairingArray($data)
+    {
+        return array(
+            'id' => $data['id'],
+            'enabled' => $data['enabled'] == 'true',
+            'pending' => $data['pending'] == 'true',
+            'user' => array(
+                'id' => $data['pairing_user_id'],
+                'name' => $data['user_name'],
+                'toopher_authentication_enabled' => $data['user_toopher_authentication_enabled']
+            )
+        );
+    }
+
+    private function createUserArray($data)
+    {
+        return array(
+            'id' => $data['id'],
+            'name' => $data['name'],
+            'toopher_authentication_enabled' => $data['toopher_authentication_enabled'] == 'true'
+        );
+    }
+
+    private function getOauthSignedUrl($url, $ttl, $queryParams)
+    {
+        $queryParams['v'] = ToopherIframe::VERSION;
+        $queryParams['expires'] = $this->getUnixTimestamp() + $ttl;
+
+        $oauthParams = $this->getOauthParams();
+        $encodedParams = $this->encodeParamsForSignature(array_merge($queryParams, $oauthParams));
+        $signature = $this->oauthConsumer->generateSignature('GET', $url, $encodedParams);
+        $oauthParams['oauth_signature'] = $signature;
+        return $this->buildUrl($url, $queryParams, $oauthParams);
+    }
+
+    private function getOauthParams()
+    {
+        $oauthParams = array(
+            'oauth_consumer_key' => $this->consumerKey,
+            'oauth_signature_method' => $this->signatureMethod,
+            'oauth_version' => $this->oauthVersion
+        );
+        $oauthParams['oauth_nonce'] = $this->nonceOverride ?: uniqid() . '.' . time();
+        $oauthParams['oauth_timestamp'] = $this->timestampOverride ?: time();
+        return $oauthParams;
+    }
+
+    private function encodeParamsForSignature($params)
+    {
+        foreach ($params as $key => $value) {
+            $params[$key] = oauth_urlencode($value);
+        }
+        return $params;
+    }
+
+    private function buildUrl($url, $queryParams, $oauthParams)
+    {
+        $query = http_build_query($queryParams);
+        $oauthQuery = http_build_query($oauthParams);
+        return $url . '?' . $query . '&' . $oauthQuery;
+    }
+}
+
+?>
diff --git a/lib/User.php b/lib/User.php
new file mode 100644
index 0000000..0d92731
--- /dev/null
+++ b/lib/User.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class User
+{
+    protected $api;
+
+    function __construct($jsonResponse, $api)
+    {
+        try {
+            $this->api = $api;
+            $this->id = $jsonResponse['id'];
+            $this->name = $jsonResponse['name'];
+            $this->toopher_authentication_enabled = $jsonResponse['toopher_authentication_enabled'];
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse user from response: ' . $e->getMessage());
+        }
+    }
+
+    public function refreshFromServer()
+    {
+        $url = 'users/' . $this->id;
+        $result = $this->api->advanced->raw->get($url);
+        $this->update($result);
+    }
+
+    public function enableToopherAuthentication()
+    {
+        $url = 'users/' . $this->id;
+        $result = $this->api->advanced->raw->post($url, array('toopher_authentication_enabled' => 'true'));
+        $this->update($result);
+    }
+
+    public function disableToopherAuthentication()
+    {
+        $url = 'users/' . $this->id;
+        $result = $this->api->advanced->raw->post($url, array('toopher_authentication_enabled' => 'false'));
+        $this->update($result);
+    }
+
+    public function update($jsonResponse)
+    {
+        try {
+            $this->name = $jsonResponse['name'];
+            $this->toopher_authentication_enabled = $jsonResponse['toopher_authentication_enabled'];
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse user from response: ' . $e->getMessage());
+        }
+
+    }
+}
+
+?>
diff --git a/lib/UserTerminal.php b/lib/UserTerminal.php
new file mode 100644
index 0000000..a061a27
--- /dev/null
+++ b/lib/UserTerminal.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class UserTerminal
+{
+    protected $api;
+
+    function __construct($jsonResponse, $api)
+    {
+        try {
+            $this->api = $api;
+            $this->id = $jsonResponse['id'];
+            $this->name = $jsonResponse['name'];
+            $this->requester_specified_id = $jsonResponse['requester_specified_id'];
+            $this->user = new User($jsonResponse['user'], $api);
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse user terminal from response: ' . $e->getMessage());
+        }
+    }
+
+    public function refreshFromServer()
+    {
+        $url = 'user_terminals/' . $this->id;
+        $result = $this->api->advanced->raw->get($url);
+        $this->update($result);
+    }
+
+    public function update($jsonResponse)
+    {
+        try {
+            $this->name = $jsonResponse['name'];
+            $this->requester_specified_id = $jsonResponse['requester_specified_id'];
+            $this->user->update($jsonResponse['user']);
+            $this->raw_response = $jsonResponse;
+        } catch (Exception $e) {
+            throw new ToopherRequestException('Could not parse user terminal from response: ' . $e->getMessage());
+        }
+    }
+}
+
+?>
diff --git a/lib/toopher_api.php b/lib/toopher_api.php
deleted file mode 100644
index caad76b..0000000
--- a/lib/toopher_api.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/*
-Copyright (c) 2012 Toopher, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-class ToopherRequestException extends Exception
-{
-    
-}
-
-class ToopherAPI
-{
-    const VERSION = '1.0.6';
-
-    protected $baseUrl;
-    protected $oauthConsumer;
-    protected $httpAdapter;
-
-    function __construct($key, $secret, $baseUrl = '', $httpAdapter = NULL)
-    {
-        if(empty($key))
-        {
-            throw new InvalidArgumentException('Toopher consumer key cannot be empty');
-        }
-        if(empty($secret))
-        {
-            throw new InvalidArgumentException('Toopher consumer secret cannot be empty');
-        }
-
-        $this->oauthConsumer = new HTTP_OAuth_Consumer($key, $secret);
-        $this->baseUrl = (!empty($baseUrl)) ? $baseUrl : 'https://api.toopher.com/v1/';
-        $this->httpAdapter = (!is_null($httpAdapter)) ? $httpAdapter : new HTTP_Request2_Adapter_Curl();
-    }
-
-    public function pair($pairingPhrase, $userName, $extras = array())
-    {
-        $params = array(
-            'pairing_phrase' => $pairingPhrase,
-            'user_name' => $userName
-        );
-        $params = array_merge($params, $extras);
-        return $this->makePairResponse($this->post('pairings/create', $params));
-    }
-
-    public function getPairingStatus($pairingId)
-    {
-        return $this->makePairResponse($this->get('pairings/' . $pairingId));
-    }
-
-    public function authenticate($pairingId, $terminalName, $actionName = '', $extras = array())
-    {
-        $params = array(
-            'pairing_id' => $pairingId,
-            'terminal_name' => $terminalName
-        );
-        if(!empty($actionName))
-        {
-            $params['action_name'] = $actionName;
-        }
-        $params = array_merge($params, $extras);
-        return $this->makeAuthResponse($this->post('authentication_requests/initiate', $params));
-    }
-
-    public function getAuthenticationStatus($authenticationRequestId)
-    {
-        return $this->makeAuthResponse($this->get('authentication_requests/' . $authenticationRequestId));
-    }
-
-    private function makePairResponse($result)
-    {
-        return array(
-            'id' => $result['id'],
-            'enabled' => $result['enabled'],
-            'userId' => $result['user']['id'],
-            'userName' => $result['user']['name'],
-            'raw' => $result
-        );
-    }
-
-    private function makeAuthResponse($result)
-    {
-        return array(
-            'id' => $result['id'],
-            'pending' => $result['pending'],
-            'granted' => $result['granted'],
-            'automated' => $result['automated'],
-            'reason' => $result['reason'],
-            'terminalId' => $result['terminal']['id'],
-            'terminalName' => $result['terminal']['name'],
-            'raw' => $result
-        );
-    }
-
-    private function post($endpoint, $parameters)
-    {
-        return $this->request('POST', $endpoint, $parameters);
-    }
-
-    private function get($endpoint)
-    {
-        return $this->request('GET', $endpoint);
-    }
-
-    private function request($method, $endpoint, $parameters = array())
-    {
-        $req = new HTTP_Request2();
-        $req->setAdapter($this->httpAdapter);
-        $req->setHeader(array('User-Agent' =>
-            sprintf('Toopher-PHP/%s (PHP %s)', ToopherAPI::VERSION, phpversion())));
-        $req->setMethod($method);
-        $req->setUrl($this->baseUrl . $endpoint);
-        if(!is_null($parameters))
-        {
-            foreach($parameters as $key => $value)
-            {
-                $req->addPostParameter($key, $value);
-            }
-        }
-        $oauthRequest = new HTTP_OAuth_Consumer_Request;
-        $oauthRequest->accept($req);
-        $this->oauthConsumer->accept($oauthRequest);
-        try {
-            $result = $this->oauthConsumer->sendRequest($this->baseUrl . $endpoint, $parameters, $method);
-        } catch (Exception $e) {
-            error_log($e);
-            throw new ToopherRequestException("Error making Toopher API request", $e->getCode(), $e);
-        }
-
-        if ($result->getStatus() != 200)
-        {
-            error_log(sprintf("Toopher API call returned unexpected HTTP response: %d - %s", $result->getStatus(), $result->getReasonPhrase()));
-            $resultBody = $result->getBody();
-            if (empty($resultBody)) {
-                error_log("empty response body");
-                throw new ToopherRequestException($result->getReasonPhrase(), $result->getStatus());
-            }
-
-            $err = json_decode($resultBody, true);
-            if ($err === NULL) {
-                $json_error = $this->json_error_to_string(json_last_error()); 
-                if (!empty($json_error)) {
-                    error_log(sprintf("Error parsing response body JSON: %s", $json_error));
-                    error_log(sprintf("response body: %s", $result->getBody()));
-                    throw new ToopherRequestException(sprintf("JSON Parsing Error: %s", $json_error));
-                }
-            } else {
-                if(array_key_exists("error_message", $err)) {
-                    throw new ToopherRequestException($err['error_message'], $err['error_code']);
-                } else {
-                    throw new ToopherRequestException(sprintf("%s - %s", $result->getReasonPhrase(), $resultBody), $result->getStatus());
-                }
-            }
-        }
-
-        $decoded = json_decode($result->getBody(), true);
-        if ($decoded === NULL) {
-            $json_error = $this->json_error_to_string(json_last_error()); 
-            if (!empty($json_error)) {
-                error_log(sprintf("Error parsing response body JSON: %s", $json_error));
-                error_log(sprintf("response body: %s", $result->getBody()));
-                throw new ToopherRequestException(sprintf("JSON Parsing Error: %s", $json_error));
-            }
-        }
-        return $decoded;   
-    }
-
-    private function json_error_to_string($json_error_code) {
-        switch ($json_error_code) {
-            case JSON_ERROR_NONE:
-                return NULL;
-            case JSON_ERROR_DEPTH:
-                return 'Maximum stack depth exceeded';
-            case JSON_ERROR_STATE_MISMATCH:
-                return 'Underflow or the modes mismatch';
-            case JSON_ERROR_CTRL_CHAR:
-                return 'Unexpected control character found';
-            case JSON_ERROR_SYNTAX:
-                return 'Syntax error, malformed JSON';
-            case JSON_ERROR_UTF8:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            default:
-                return 'Unknown error';
-        }
-    }
-}
-
-?>
diff --git a/test/ActionTest.php b/test/ActionTest.php
new file mode 100644
index 0000000..73382b3
--- /dev/null
+++ b/test/ActionTest.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class ActionTests extends PHPUnit_Framework_TestCase {
+
+	public function testActionCreatesAction()
+	{
+		$action = new Action(['id' => '1', 'name' => 'action']);
+		$this->assertTrue($action->id == '1', 'Action id was incorrect');
+		$this->assertTrue($action->name == 'action', 'Action name was incorrect');
+	}
+
+	public function testActionUpdateChangesAction()
+	{
+		$action = new Action(['id' => '1', 'name' => 'action changed']);
+		$action->update(['id'=>'1', 'name'=>'action changed']);
+		$this->assertTrue($action->id == '1', 'Action id was incorrect');
+		$this->assertTrue($action->name == 'action changed', 'Action name was incorrect');
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse action from response
+	*/
+	public function testActionMissingKeyFails()
+	{
+		$action = new Action(['name' => 'action changed']);
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse action from response
+	*/
+	public function testActionUpdateMissingKeyFails()
+	{
+		$action = new Action(['id' => '1', 'name' => 'action changed']);
+		$action->update(['id'=>'1']);
+	}
+}
+
+?>
diff --git a/test/AuthenticationRequestTest.php b/test/AuthenticationRequestTest.php
new file mode 100644
index 0000000..8665ed6
--- /dev/null
+++ b/test/AuthenticationRequestTest.php
@@ -0,0 +1,156 @@
+<?php
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+*/
+
+class AuthenticationRequestTests extends PHPUnit_Framework_TestCase {
+	protected function setUp()
+	{
+		$this->mock = new HTTP_Request2_Adapter_Mock();
+	}
+
+	protected function getAuthenticationRequestJson()
+	{
+		return [
+			'id'=>'1',
+			'pending'=>true,
+			'granted'=>false,
+			'automated'=>false,
+			'reason_code'=>'1',
+			'reason'=>'some reason',
+			'terminal'=>[
+				'id'=>'1',
+				'name'=>'term name',
+				'requester_specified_id'=>'1',
+				'user'=>[
+					'id'=>'1',
+					'name'=>'user',
+					'toopher_authentication_enabled'=>'true'
+				]
+			],
+			'user'=>[
+				'id'=>'1',
+				'name'=>'user',
+				'toopher_authentication_enabled'=>'true'
+			],
+			'action'=>[
+				'id'=>'1',
+				'name'=>'test'
+			]
+		];
+	}
+
+	protected function getToopherApi($mock = NULL)
+	{
+		return new ToopherApi('key', 'secret', '', $mock);
+	}
+
+	protected function getAuthenticationRequest($api)
+	{
+		return new AuthenticationRequest($this->getAuthenticationRequestJson(), $api);
+	}
+
+	public function testAuthenticationRequestCreatesAuthenticationRequest()
+	{
+		$authRequest = $this->getAuthenticationRequest($this->getToopherApi());
+		$this->assertTrue($authRequest->id == '1', 'Authentication request id was incorrect');
+		$this->assertTrue($authRequest->pending == true, 'Authentication request should be pending');
+		$this->assertTrue($authRequest->granted == false, 'Authentication request should not be granted');
+		$this->assertTrue($authRequest->automated == false, 'Authentication request should not be automated');
+		$this->assertTrue($authRequest->reason_code == '1', 'Authentication request reason code was incorrect');
+		$this->assertTrue($authRequest->reason == 'some reason', 'Authentication request reason was incorrect');
+		$this->assertTrue($authRequest->terminal->id == '1', 'Terminal id was incorrect');
+		$this->assertTrue($authRequest->terminal->name == 'term name', 'Terminal name was incorrect');
+		$this->assertTrue($authRequest->terminal->requester_specified_id == '1', 'Terminal requester_specified_id was incorrect');
+		$this->assertTrue($authRequest->user->id == '1', 'User id was incorrect');
+		$this->assertTrue($authRequest->user->name == 'user', 'User name was incorrect');
+		$this->assertTrue($authRequest->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+		$this->assertTrue($authRequest->action->id == '1', 'Action id was incorrect');
+		$this->assertTrue($authRequest->action->name == 'test', 'Action name was incorrect');
+	}
+
+	public function testAuthenticationRequestRefreshFromServerUpdatesAuthenticationRequest()
+	{
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
+		$resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some other reason","terminal":{"id":"1","name":"term name changed","requester_specified_id":"1","user":{"id":"1","name":"user changed", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user changed", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test changed"}}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$authRequest = $this->getAuthenticationRequest($toopher);
+
+		$authRequest->refreshFromServer();
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+		$this->assertTrue($authRequest->pending == false, 'Authentication request should not be pending');
+		$this->assertTrue($authRequest->granted == true, 'Authentication request should be granted');
+		$this->assertTrue($authRequest->automated == true, 'Authentication request should be automated');
+		$this->assertTrue($authRequest->reason == 'some other reason', 'Authentication request reason was incorrect');
+		$this->assertTrue($authRequest->terminal->name == 'term name changed', 'Terminal name was incorrect');
+		$this->assertTrue($authRequest->user->name == 'user changed', 'User name was incorrect');
+		$this->assertTrue($authRequest->action->name == 'test changed', 'Action name was incorrect');
+	}
+
+	public function testGrantAuthenticationRequestPostsOtp(){
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1/otp_auth');
+		$resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$authRequest = $this->getAuthenticationRequest($toopher);
+
+		$authRequest->grantWithOtp('foo');
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getBody() == 'otp=foo', "Post params should include 'otp=foo'");
+
+		$this->assertTrue($authRequest->pending == false, 'Authentication request should not be pending');
+		$this->assertTrue($authRequest->granted == true, 'Authentication request should be granted');
+		$this->assertTrue($authRequest->automated == true, 'Authentication request should be automated');
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse authentication request from response
+	*/
+	public function testAuthenticationRequestMissingKeyFails()
+	{
+		$authJson = $this->getAuthenticationRequestJson();
+		unset($authJson['id']);
+		new AuthenticationRequest($authJson, $this->getToopherApi());
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse authentication request from response
+	*/
+	public function testAuthenticationRequestUpdateMissingKeyFails()
+	{
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
+		$resp->appendBody('{"id":"1","granted":true,"automated":true,"reason_code":"1","reason":"some other reason","terminal":{"id":"1","name":"term name changed","requester_specified_id":"1","user":{"id":"1","name":"user changed", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user changed", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test changed"}}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$authRequest = $this->getAuthenticationRequest($toopher);
+
+		$authRequest->refreshFromServer();
+	}
+}
+
+?>
diff --git a/test/PairingTest.php b/test/PairingTest.php
new file mode 100644
index 0000000..5bfaea0
--- /dev/null
+++ b/test/PairingTest.php
@@ -0,0 +1,150 @@
+<?php
+
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class PairingTests extends PHPUnit_Framework_TestCase {
+
+	protected function setUp()
+	{
+		$this->mock = new HTTP_Request2_Adapter_Mock();
+	}
+
+	protected function getPairingJson()
+	{
+		return [
+			'id' => '1',
+			'enabled' => true,
+			'pending' => false,
+			'user' => [
+				'id' => '1',
+				'name' => 'user',
+				'toopher_authentication_enabled' => 'true'
+			]
+		];
+	}
+
+	protected function getToopherApi($mock = NULL)
+	{
+		return new ToopherApi('key', 'secret', '', $mock);
+	}
+
+	protected function getPairing($api)
+	{
+		return new Pairing($this->getPairingJson(), $api);
+	}
+
+	public function testPairingCreatesPairing(){
+		$pairing = $this->getPairing($this->getToopherApi());
+		$this->assertTrue($pairing->id == '1', 'Pairing id was incorrect');
+		$this->assertTrue($pairing->enabled == true, 'Pairing should be enabled');
+		$this->assertTrue($pairing->pending == false, 'Pairing should not be pending');
+		$this->assertTrue($pairing->user->id == '1', 'User id was incorrect');
+		$this->assertTrue($pairing->user->name == 'user', 'User name was incorrect');
+		$this->assertTrue($pairing->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+	}
+
+
+	public function testPairingRefreshFromServerUpdatesPairing(){
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/1');
+		$resp->appendBody('{"id":"1","enabled":false,"pending":true,"user":{"id":"1","name":"user name changed", "toopher_authentication_enabled":false}}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$pairing = $this->getPairing($toopher);
+
+		$pairing->refreshFromServer();
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+		$this->assertTrue($pairing->enabled == false, 'Pairing should not be enabled');
+		$this->assertTrue($pairing->pending == true, 'Pairing should be pending');
+		$this->assertTrue($pairing->user->name == 'user name changed', 'User name was incorrect');
+		$this->assertTrue($pairing->user->toopher_authentication_enabled == false, 'User should not be toopher_authentication_enabled');
+	}
+
+	public function testGetPairingResetLinkShouldReturnValidLink(){
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/1/generate_reset_link');
+		$resp->appendBody('{"url":"http://api.toopher.test/v1/pairings/1/reset?reset_authorization=abcde"}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$pairing = $this->getPairing($toopher);
+
+		$resetLink = $pairing->getResetLink();
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+		$this->assertTrue($resetLink == 'http://api.toopher.test/v1/pairings/1/reset?reset_authorization=abcde', 'Pairing reset link was incorrect');
+	}
+
+	public function testEmailPairingResetLinkShouldPostToCorrectUrl(){
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/1/send_reset_link');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$pairing = $this->getPairing($toopher);
+
+		$pairing->emailResetLink('jdoe@example.com');
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getBody() == 'reset_email=jdoe%40example.com', "Post params should include 'reset_email=jdoe%40example.com'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == 'https://api.toopher.com/v1/pairings/1/send_reset_link', "Last called url should be 'https://api.toopher.com/v1/pairings/1/send_reset_link'");
+	}
+
+	public function testPairingGetQrCodeImageShouldGetFromCorrectUrl(){
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/qr/pairings/1');
+		$resp->appendBody('{}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$pairing = $this->getPairing($toopher);
+
+		$pairing->getQrCodeImage();
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == 'https://api.toopher.com/v1/qr/pairings/1', "Last called url should be 'https://api.toopher.com/v1/qr/pairings/1'");
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse pairing from response
+	*/
+	public function testPairingMissingKeyFails()
+	{
+		$pairingJson = $this->getPairingJson();
+		unset($pairingJson['id']);
+		new Pairing($pairingJson, $this->getToopherApi());
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse pairing from response
+	*/
+	public function testPairingUpdateMissingKeyFails()
+	{
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/1');
+		$resp->appendBody('{"id":"1","pending":true,"user":{"id":"1","name":"user name changed", "toopher_authentication_enabled":false}}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$pairing = $this->getPairing($toopher);
+
+		$pairing->refreshFromServer();
+	}
+}
+
+?>
diff --git a/test/ToopherApiTest.php b/test/ToopherApiTest.php
new file mode 100644
index 0000000..ebc9f23
--- /dev/null
+++ b/test/ToopherApiTest.php
@@ -0,0 +1,578 @@
+<?php
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+require_once('bootstrap.php');
+use Rhumsaa\Uuid\Uuid;
+
+class ToopherApiTests extends PHPUnit_Framework_TestCase {
+
+    const DEFAULT_BASE_URL = 'https://api.toopher.test/v1/';
+
+    protected function setUp()
+    {
+        $this->mock = new HTTP_Request2_Adapter_Mock();
+    }
+
+    protected function getToopherApi($mock = NULL)
+    {
+        return new ToopherApi('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, $mock);
+    }
+
+    protected function getApiRawRequesterReflectionMethod()
+    {
+        $method = new ReflectionMethod('ApiRawRequester', 'json_error_to_string');
+        $method->setAccessible(true);
+        return $method;
+    }
+
+    public function compareToDefaultPairing($pairing)
+    {
+        $this->assertTrue($pairing->id == '1', 'Pairing id was incorrect');
+        $this->assertTrue($pairing->enabled == true, 'Pairing should be enabled');
+        $this->assertTrue($pairing->pending == false, 'Pairing should not be pending');
+        $this->assertTrue($pairing->user->id == '1', 'User id was incorrect');
+        $this->assertTrue($pairing->user->name == 'user', 'User name was wrong');
+        $this->assertTrue($pairing->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+    }
+
+    public function compareToDefaultAuthenticationRequest($authRequest, $id = '1')
+    {
+        $this->assertTrue($authRequest->id == $id, 'Authentiation request id was incorrect');
+        $this->assertTrue($authRequest->pending == false, 'Authentication request should not be pending');
+        $this->assertTrue($authRequest->granted == true, 'Authentication request should be granted');
+        $this->assertTrue($authRequest->automated == true, 'Authentiation request should be automated');
+        $this->assertTrue($authRequest->reason_code == '1', 'Authentication request reason code was incorrect');
+        $this->assertTrue($authRequest->reason == 'some reason', 'Authentication request reason was incorrect');
+        $this->assertTrue($authRequest->terminal->id == '1', 'Terminal id was incorrect');
+        $this->assertTrue($authRequest->terminal->name == 'term name', 'Terminal name was incorrect');
+        $this->assertTrue($authRequest->terminal->requester_specified_id == '1', 'Terminal requester_specified_id was incorrect');
+        $this->assertTrue($authRequest->user->id == '1', 'User id was incorrect');
+        $this->assertTrue($authRequest->user->name == 'user', 'User name was incorrect');
+        $this->assertTrue($authRequest->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+        $this->assertTrue($authRequest->action->id == '1', 'Action id was incorrect');
+        $this->assertTrue($authRequest->action->name == 'test', 'Action name was incorrect');
+    }
+
+    public function compareToDefaultUser($user)
+    {
+        $this->assertTrue($user->id == '1', 'User id was incorrect');
+        $this->assertTrue($user->name == 'user', 'User name was incorrect');
+        $this->assertTrue($user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+    }
+
+    public function compareToDefaultUserTerminal($userTerminal)
+    {
+        $this->assertTrue($userTerminal->id == '1', 'wrong terminal id');
+        $this->assertTrue($userTerminal->name == 'terminal name', 'wrong terminal name');
+        $this->assertTrue($userTerminal->requester_specified_id == 'requester specified id', 'wrong requester specified id');
+        $this->assertTrue($userTerminal->user->id == '1', 'bad user id');
+        $this->assertTrue($userTerminal->user->name == 'user name', 'bad user name');
+        $this->assertTrue($userTerminal->user->toopher_authentication_enabled == true, 'toopher authentication should be enabled');
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Toopher consumer key cannot be empty
+     */
+    public function testEmptyKeyThrowsException()
+    {
+        $toopher = new ToopherApi('', 'secret');
+    }
+
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage Toopher consumer secret cannot be empty
+     */
+    public function testEmptySecretThrowsException()
+    {
+        $toopher = new ToopherApi('key', '');
+    }
+
+    public function testCanCreateToopherApiWithArguments()
+    {
+        $toopher = new ToopherApi('key', 'secret');
+    }
+
+    public function testToopherVersionStringExists()
+    {
+        $this->assertNotEmpty(ToopherApi::VERSION, 'no version string');
+        list($major, $minor, $patch) = explode('.', ToopherApi::VERSION);
+        $this->assertGreaterThanOrEqual(1, (int)$major);
+        $this->assertGreaterThanOrEqual(0, (int)$minor);
+        $this->assertGreaterThanOrEqual(0, (int)$patch);
+    }
+
+    public function testDefaultBaseUrl()
+    {
+        $this->assertTrue(ToopherApi::DEFAULT_BASE_URL == 'https://api.toopher.com/v1/', "Default base url should be 'https://api.toopher.com/v1/'");
+    }
+
+    public function testPairReturnsPairing()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/create');
+        $resp->appendBody('{"id":"1","enabled":true,"pending":false,"user":{"id":"1","name":"user", "toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $pairing = $toopher->pair('user', 'immediate pair');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'pairings/create', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'pairings/create'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['user_name'] == 'user', "Last called parameters should include key-value pair: 'user_name'=>'user'");
+        $this->assertTrue($parameters['pairing_phrase'] == 'immediate pair', "Last called parameters should include key-value pair: 'pairing_phrase'=>'immediate pair'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultPairing($pairing);
+    }
+
+    public function testPairSmsReturnsPairing()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/create/sms');
+        $resp->appendBody('{"id":"1", "enabled":true, "pending":false, "user":{"id":"1", "name":"user", "toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $pairing = $toopher->pair('user', '555-555-5555');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'pairings/create/sms', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'pairings/create/sms'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['user_name'] == 'user', "Last called parameters should include key-value pair: 'user_name'=>'user'");
+        $this->assertTrue($parameters['phone_number'] == '555-555-5555', "Last called parameters should include key-value pair: 'phone_number'=>'555-555-5555'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultPairing($pairing);
+    }
+
+    public function testPairQrReturnsPairing()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/create/qr');
+        $resp->appendBody('{"id":"1", "enabled":true, "pending":false, "user":{"id":"1", "name":"user", "toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $pairing = $toopher->pair('user');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'pairings/create/qr', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'pairings/create/qr'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['user_name'] == 'user', "Last called parameters should include key-value pair: 'user_name'=>'user'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultPairing($pairing);
+    }
+
+    public function testAuthenticateWithPairingIdReturnsAuthenticationRequest()
+    {
+        $id = Uuid::uuid4()->toString();
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/initiate');
+        $resp->appendBody('{"id":"' . $id . '","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $authRequest = $toopher->authenticate($id);
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['pairing_id'] == $id, "Last called parameters should include key-value pair: 'pairing_id'=>" . $id);
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultAuthenticationRequest($authRequest, $id);
+    }
+
+    public function testAuthenticateWithPairingIdOptionalArgsAndExtrasReturnsAuthenticationRequest()
+    {
+        $extras = array('foo' => 'bar');
+        $id = Uuid::uuid4()->toString();
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/initiate');
+        $resp->appendBody('{"id":"' . $id . '","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $authRequest = $toopher->authenticate($id, 'term name', '1', 'it is a test', $extras);
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->assertTrue($parameters['pairing_id'] == $id, sprintf("Last called parameters should include key-value pair: 'pairing_id'=> %s", $id));
+        $this->assertTrue($parameters['action_name'] == 'it is a test', "Last called parameters should include key-value pair: 'action_name'=>'it is a test'");
+        $this->assertTrue($parameters['terminal_name'] == 'term name', "Last called parameters should include key-value pair: 'terminal_name'=>'term name'");
+        $this->assertTrue($parameters['requester_specified_terminal_id'] == '1', "Last called parameters should include key-value pair: 'requester_specified_terminal_id'=>'1'");
+        $this->assertTrue($parameters['foo'] == 'bar', "Last called parameters should include key-value pair: 'foo'=>'bar'");
+        $this->compareToDefaultAuthenticationRequest($authRequest, $id);
+    }
+
+    public function testAuthenticateWithUsernameReturnsAuthenticationRequest()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/initiate');
+        $resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $authRequest = $toopher->authenticate('user');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['user_name'] == 'user', "Last called parameters should include key-value pair: 'user_name'=>'user'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultAuthenticationRequest($authRequest);
+    }
+
+    public function testAuthenticateWithUsernameOptionalArgsAndExtrasReturnsAuthenticationRequest()
+    {
+        $extras = array('foo' => 'bar');
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/initiate');
+        $resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $authRequest = $toopher->authenticate('user', 'term name', '1', 'it is a test', $extras);
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->assertTrue($parameters['user_name'] == 'user', "Last called parameters should include key-value pair: 'user_name'=>'user'");
+        $this->assertTrue($parameters['action_name'] == 'it is a test', "Last called parameters should include key-value pair: 'action_name'=>'it is a test'");
+        $this->assertTrue($parameters['terminal_name'] == 'term name', "Last called parameters should include key-value pair: 'terminal_name'=>'term name'");
+        $this->assertTrue($parameters['requester_specified_terminal_id'] == '1', "Last called parameters should include key-value pair: 'requester_specified_terminal_id'=>'1'");
+        $this->assertTrue($parameters['foo'] == 'bar', "Last called parameters should include key-value pair: 'foo'=>'bar'");
+        $this->compareToDefaultAuthenticationRequest($authRequest);
+    }
+
+    public function testRawPost()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/initiate');
+        $resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $params = array('pairing_id' => '1', 'terminal_name' => 'term name');
+        $authRequest = $toopher->advanced->raw->post('authentication_requests/initiate', $params);
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/initiate'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->assertTrue($authRequest['id'] == '1', 'Authentication request id was incorrect');
+        $this->assertTrue($authRequest['pending'] == false, 'Authentication request should not be pending');
+        $this->assertTrue($authRequest['granted'] == true, 'Authentication request should be granted');
+        $this->assertTrue($authRequest['automated'] == true, 'Authentication request should be automated');
+        $this->assertTrue($authRequest['reason_code'] == '1', 'Authentication request reason code was incorrect');
+        $this->assertTrue($authRequest['reason'] == 'some reason', 'Authentication request reason was incorrect');
+        $this->assertTrue($authRequest['terminal'] == array('id'=>'1', 'name'=>'term name', 'requester_specified_id'=>'1', 'user'=>array('id'=>'1', 'name'=>'user', 'toopher_authentication_enabled'=>true)), 'Terminal data was incorrect');
+        $this->assertTrue($authRequest['user'] == array('id'=>'1', 'name'=>'user', 'toopher_authentication_enabled'=>true), 'User data was incorrect');
+        $this->assertTrue($authRequest['action'] == array('id'=>'1', 'name'=>'test'), 'Action data was incorrect');
+    }
+
+    public function testRawGet()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $authRequest = $toopher->advanced->raw->get('authentication_requests/1');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/1', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/1'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+        $this->assertTrue($authRequest['id'] == '1', 'Authentication request id was incorrect');
+        $this->assertTrue($authRequest['pending'] == false, 'Authentication request should not be pending');
+        $this->assertTrue($authRequest['granted'] == true, 'Authentication request should be granted');
+        $this->assertTrue($authRequest['automated'] == true, 'Authentication request should be automated');
+        $this->assertTrue($authRequest['reason_code'] == '1', 'Authentication request reason code was incorrect');
+        $this->assertTrue($authRequest['reason'] == 'some reason', 'Authentication request reason was incorrect');
+        $this->assertTrue($authRequest['terminal'] == array('id'=>'1', 'name'=>'term name', 'requester_specified_id'=>'1', 'user'=>array('id'=>'1', 'name'=>'user', 'toopher_authentication_enabled'=>true)), 'Terminal data was incorrect');
+        $this->assertTrue($authRequest['user'] == array('id'=>'1', 'name'=>'user', 'toopher_authentication_enabled'=>true), 'User data was incorrect');
+        $this->assertTrue($authRequest['action'] == array('id'=>'1', 'name'=>'test'), 'Action data was incorrect');
+    }
+
+    /**
+    * @expectedException ToopherRequestException
+    * @expectedExceptionMessage Error making Toopher API request
+    */
+    public function testGetWithoutHttpRequestMockRaisesToopherRequestException()
+    {
+        $toopher = $this->getToopherApi();
+        $toopher->advanced->raw->get('');
+    }
+
+    public function testPairingsGetByIdReturnsPairing()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/pairings/1');
+        $resp->appendBody('{"id":"1","enabled":true, "pending":false, "user":{"id":"1","name":"user", "toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $pairing = $toopher->advanced->pairings->getById('1');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'pairings/1', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'pairings/1'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+        $this->compareToDefaultPairing($pairing);
+    }
+
+    public function testAuthenticationRequestsGetByIdReturnsAuthenticationRequest()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason_code":"1","reason":"some reason","terminal":{"id":"1","name":"term name","requester_specified_id":"1","user":{"id":"1","name":"user", "toopher_authentication_enabled":true}},"user":{"id":"1","name":"user", "toopher_authentication_enabled":true},"action":{"id":"1","name":"test"}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $authRequest = $toopher->advanced->authenticationRequests->getById('1');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/1', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'authentication_requests/1'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+        $this->compareToDefaultAuthenticationRequest($authRequest);
+    }
+
+    public function testUsersGetByIdReturnsUser()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users/1');
+        $resp->appendBody('{"id":"1","name":"user","toopher_authentication_enabled":true}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $user = $toopher->advanced->users->getById('1');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'users/1', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'users/1'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+        $this->compareToDefaultUser($user);
+    }
+
+    public function testUsersGetByNameReturnsUser()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users');
+        $resp->appendBody('[{"id":"1","name":"user","toopher_authentication_enabled":true}]');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $user = $toopher->advanced->users->getByName('user');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'users?user_name=user', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'users?user_name=user'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+        $this->compareToDefaultUser($user);
+    }
+
+    /**
+    * @expectedException ToopherRequestException
+    * @expectedExceptionMessage Multiple users with name
+    */
+    public function testUsersGetByNameWithMultipleUsersRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users');
+        $resp->appendBody('[{"id":"1","name":"user","toopher_authentication_enabled":true}, {"id":"2","name":"user","toopher_authentication_enabled":true}]');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $user = $toopher->advanced->users->getByName('user');
+    }
+
+    /**
+    * @expectedException ToopherRequestException
+    * @expectedExceptionMessage No users with name
+    */
+    public function testUsersGetByNameWithNoUsersRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users');
+        $resp->appendBody('[]');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $user = $toopher->advanced->users->getByName('user');
+    }
+
+    public function testUsersCreateReturnsUser()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users/create');
+        $resp->appendBody('{"id":"1","name":"user","toopher_authentication_enabled":true}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $user = $toopher->advanced->users->create('paired user');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'users/create', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'users/create'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['name'] == 'paired user', "Last called parameters should include key-value pair: 'name'=>'paired user'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultUser($user);
+    }
+
+    public function testUsersCreateWithExtrasReturnsUser()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users/create');
+        $resp->appendBody('{"id":"1","name":"user","toopher_authentication_enabled":true}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $user = $toopher->advanced->users->create('paired user', array('foo'=>'bar'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'users/create', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'users/create'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['name'] == 'paired user', "Last called parameters should include key-value pair: 'name'=>'paired user'");
+        $this->assertTrue($parameters['foo'] == 'bar', "Last called parameters should include key-value pair: 'foo'=>'bar'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultUser($user);
+    }
+
+    public function testUserTerminalsGetByIdReturnsUserTerminal()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/user_terminals/1');
+        $resp->appendBody('{"id":"1", "name":"terminal name", "requester_specified_id": "requester specified id", "user":{"id":"1","name":"user name","toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $userTerminal = $toopher->advanced->userTerminals->getById('1');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'user_terminals/1', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'user_terminals/1'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+        $this->compareToDefaultUserTerminal($userTerminal);
+    }
+
+    public function testUserTerminalCreateReturnsUserTerminal()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/user_terminals/create');
+        $resp->appendBody('{"id":"1", "name":"terminal name", "requester_specified_id": "requester specified id", "user":{"id":"1","name":"user name","toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $userTerminal = $toopher->advanced->userTerminals->create('name', 'terminal one', 'requester specified id');
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'user_terminals/create', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'user_terminals/create'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['user_name'] == 'name', "Last called parameters should include key-value pair: 'user_name'=>'name'");
+        $this->assertTrue($parameters['name'] == 'terminal one', "Last called parameters should include key-value pair: 'name'=>'terminal one'");
+        $this->assertTrue($parameters['name_extra'] == 'requester specified id', "Last called parameters should include key-value pair: 'name_extra'=>'requester specified id'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultUserTerminal($userTerminal);
+    }
+
+    public function testUserTerminalCreateWithExtrasReturnsUserTerminal()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/user_terminals/create');
+        $resp->appendBody('{"id":"1", "name":"terminal name", "requester_specified_id": "requester specified id", "user":{"id":"1","name":"user name","toopher_authentication_enabled":true}}');
+        $this->mock->addResponse($resp);
+
+        $toopher = $this->getToopherApi($this->mock);
+        $userTerminal = $toopher->advanced->userTerminals->create('name', 'terminal one', 'requester specified id', array('foo'=>'bar'));
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == ToopherApiTests::DEFAULT_BASE_URL . 'user_terminals/create', sprintf("Last called url should be '%s'", ToopherApiTests::DEFAULT_BASE_URL . 'user_terminals/create'));
+        $parameters = $toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getParameters();
+        $this->assertTrue($parameters['user_name'] == 'name', "Last called parameters should include key-value pair: 'user_name'=>'name'");
+        $this->assertTrue($parameters['name'] == 'terminal one', "Last called parameters should include key-value pair: 'name'=>'terminal one'");
+        $this->assertTrue($parameters['name_extra'] == 'requester specified id', "Last called parameters should include key-value pair: 'name_extra'=>'requester specified id'");
+        $this->assertTrue($parameters['foo'] == 'bar', "Last called parameters should include key-value pair: 'foo'=>'bar'");
+        $this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+        $this->compareToDefaultUserTerminal($userTerminal);
+    }
+
+    /**
+     * @expectedException ToopherRequestException
+     * @expectedExceptionMessage Not a valid OAuth signed request
+     */
+    public function test401RaisesToopherRequestEception()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 401 Unauthorized', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody('{"error_code":401, "error_message":"Not a valid OAuth signed request"}');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $auth = $toopher->advanced->authenticationRequests->getById('1');
+    }
+
+    /**
+     * @expectedException ToopherRequestException
+     * @expectedExceptionMessage Forbidden
+     */
+    public function test403WithEmptyBodyRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 403 Forbidden', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $auth = $toopher->advanced->authenticationRequests->getById('1');
+    }
+
+    /**
+     * @expectedException ToopherRequestException
+     * @expectedExceptionMessage JSON Parsing Error: Syntax error, malformed JSON
+     */
+    public function test403WithUnprintableBodyRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 403 Forbidden', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody(sprintf("{'error_code':403, 'error_message':'%c'}", chr(5)));
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $auth = $toopher->advanced->authenticationRequests->getById('1');
+    }
+
+    /**
+    * @expectedException ToopherRequestException
+    * @expectedExceptionMessage Forbidden - {"error_code":401}
+    */
+    public function test403WithEmptyMessageRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 403 Forbidden', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody('{"error_code":401}');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $auth = $toopher->advanced->authenticationRequests->getById('1');
+    }
+
+    /**
+    * @expectedException ToopherRequestException
+    * @expectedExceptionMessage JSON Parsing Error: Syntax error, malformed JSON
+    */
+    public function test403WithBadJsonRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 403 Forbidden', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody('stuff');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $auth = $toopher->advanced->authenticationRequests->getById('1');
+    }
+
+    /**
+    * @expectedException ToopherRequestException
+    * @expectedExceptionMessage JSON Parsing Error: Syntax error, malformed JSON
+    */
+    public function test200WithEmptyMessageRaisesToopherRequestException()
+    {
+        $resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/authentication_requests/1');
+        $resp->appendBody('stuff');
+        $this->mock->addResponse($resp);
+        $toopher = $this->getToopherApi($this->mock);
+        $auth = $toopher->advanced->authenticationRequests->getById('1');
+    }
+
+    public function testJsonErrorToStringErrorNone()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 0) == null, "JSON error code '0' should return 'null'");
+    }
+
+    public function testJsonErrorToStringErrorDepth()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 1) == 'Maximum stack depth exceeded', "JSON error code '1' should return 'Maximum stack depth exceeded'");
+    }
+
+    public function testJsonErrorToStringErrorStateMismatch()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 2) == 'Underflow or the modes mismatch', "JSON error code '2' should return 'Underflow or the modes mismatch'");
+    }
+
+    public function testJsonErrorToStringErrorCtrlChar()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 3) == 'Unexpected control character found', "JSON error code '3' should return 'Unexpected control character found'");
+    }
+
+    public function testJsonErrorToStringErrorSyntax()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 4) == 'Syntax error, malformed JSON', "JSON error code '4' should return 'Syntax error, malformed JSON'");
+    }
+
+    public function testJsonErrorToStringErrorUTF8()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 5) == 'Malformed UTF-8 characters, possibly incorrectly encoded', "JSON error code '5' should return 'Malformed UTF-8 characters, possibly incorrectly encoded'");
+    }
+
+    public function testJsonErrorToStringErrorUnknown()
+    {
+        $method = $this->getApiRawRequesterReflectionMethod();
+        $this->assertTrue($method->invoke(new ApiRawRequester('key', 'secret', ToopherApiTests::DEFAULT_BASE_URL, null), 6) == 'Unknown error', "JSON error code '6' should return 'Unknown error'");
+    }
+}
+
+?>
diff --git a/test/ToopherIframeTest.php b/test/ToopherIframeTest.php
new file mode 100644
index 0000000..fa8a2f5
--- /dev/null
+++ b/test/ToopherIframeTest.php
@@ -0,0 +1,418 @@
+<?php
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+require_once('bootstrap.php');
+use Rhumsaa\Uuid\Uuid;
+
+class ToopherIframeTests extends PHPUnit_Framework_TestCase {
+
+	const OAUTH_NONCE = '12345678';
+	const IFRAME_KEY = 'abcdefg';
+	const IFRAME_SECRET = 'hijklmnop';
+	const REQUEST_TOKEN = 's9s7vsb';
+
+	protected function getAuthenticationRequestData()
+	{
+		return array(
+			'id' => '1',
+			'pending' => 'false',
+			'granted' => 'true',
+			'automated' => 'false',
+			'reason_code' => '100',
+			'reason' => 'it is a test',
+			'terminal_id' => '1',
+			'terminal_name' => 'terminal name',
+			'terminal_requester_specified_id' => 'requester specified id',
+			'pairing_user_id' => '1',
+			'user_name' => 'user name',
+			'user_toopher_authentication_enabled' => 'true',
+			'action_id' => '1',
+			'action_name' => 'action name',
+			'toopher_sig' => 's+fYUtChrNMjES5Xa+755H7BQKE=',
+			'session_token' => $this->getRequestToken(),
+			'timestamp' => '1000',
+			'resource_type' => 'authentication_request'
+		);
+	}
+
+	protected function getPairingData()
+	{
+		return array(
+			'id' => '1',
+			'enabled' => 'true',
+			'pending' => 'false',
+			'pairing_user_id' => '1',
+			'user_name' => 'user name',
+			'user_toopher_authentication_enabled' => 'true',
+			'toopher_sig' => 'ucwKhkPpN4VxNbx3dMypWzi4tBg=',
+			'session_token' => $this->getRequestToken(),
+			'timestamp' => '1000',
+			'resource_type' => 'pairing'
+		);
+	}
+
+	protected function getUserData()
+	{
+		return array(
+			'id' => '1',
+			'name' => 'user name',
+			'toopher_authentication_enabled' => 'true',
+			'toopher_sig' => 'RszgG9QE1rF9t7DVTGg+1I25yHM=',
+	        'session_token' => $this->getRequestToken(),
+	        'timestamp' => '1000',
+	        'resource_type' => 'requester_user'
+		);
+	}
+
+	protected function getUrlencodedData($data)
+	{
+		return array('toopher_iframe_data'=>utf8_encode(http_build_query($data)));
+	}
+
+	public static function getOauthTimestamp()
+	{
+		date_default_timezone_set('UTC');
+		return mktime(0, 16, 40, 1, 1, 1970);
+	}
+
+	public static function getOauthNonce()
+	{
+		return self::OAUTH_NONCE;
+	}
+
+	public static function getIframeKey()
+	{
+		return self::IFRAME_KEY;
+	}
+
+	public static function getIframeSecret()
+	{
+		return self::IFRAME_SECRET;
+	}
+
+	public static function getRequestToken()
+	{
+		return self::REQUEST_TOKEN;
+	}
+
+	protected function setUp()
+	{
+		$this->toopherIframe = new ToopherIframe($this->getIframeKey(), $this->getIframeSecret(), 'https://api.toopher.test/v1/');
+		$this->toopherIframe->setTimestampOverride($this->getOauthTimestamp());
+	}
+
+	/**
+	* @expectedException InvalidArgumentException
+	* @expectedExceptionMessage Toopher consumer key cannot be empty
+	*/
+	public function testEmptyKeyThrowsException()
+	{
+		$toopher = new ToopherIframe('', 'secret');
+	}
+
+	/**
+	* @expectedException InvalidArgumentException
+	* @expectedExceptionMessage Toopher consumer secret cannot be empty
+	*/
+	public function testEmptySecretThrowsException()
+	{
+		$toopher = new ToopherIframe('key', '');
+	}
+
+	public function testGetAuthenticationUrlOnlyUsernameReturnsValidUrl()
+	{
+		$this->toopherIframe->setNonceOverride($this->getOauthNonce());
+		$expectedUrl = 'https://api.toopher.test/v1/web/authenticate?username=jdoe&reset_email=&action_name=Log+In&session_token=&requester_metadata=&v=2&expires=1300&oauth_consumer_key=abcdefg&oauth_signature_method=HMAC-SHA1&oauth_version=1.0&oauth_nonce=12345678&oauth_timestamp=1000&oauth_signature=NkaWUjEPRLwgsQMEJGsIQEpyRT4%3D';
+		$authenticationUrl = $this->toopherIframe->getAuthenticationUrl('jdoe');
+		$this->assertTrue($authenticationUrl == $expectedUrl, 'Authentication url was incorrect');
+	}
+
+	public function testGetAuthenticationUrlWithOptionalArgsReturnsValidUrl()
+	{
+		$this->toopherIframe->setNonceOverride($this->getOauthNonce());
+		$expectedUrl = 'https://api.toopher.test/v1/web/authenticate?username=jdoe&reset_email=jdoe%40example.com&action_name=it+is+a+test&session_token=s9s7vsb&requester_metadata=metadata&v=2&expires=1300&oauth_consumer_key=abcdefg&oauth_signature_method=HMAC-SHA1&oauth_version=1.0&oauth_nonce=12345678&oauth_timestamp=1000&oauth_signature=2TydgMnUwWoiwfpljKpSaFg0Luo%3D';
+		$authenticationUrl = $this->toopherIframe->getAuthenticationUrl('jdoe', 'jdoe@example.com', $this->getRequestToken(), 'it is a test', 'metadata');
+		$this->assertTrue($authenticationUrl == $expectedUrl, 'Authentication url was incorrect');
+	}
+
+	public function testGetAuthenticationUrlWithOptionalArgsAndExtrasReturnsValidUrl()
+	{
+		$extras = array(
+			'allow_inline_pairing' => 'false',
+			'automation_allowed' => 'false',
+			'challenge_required' => 'true',
+			'ttl' => '100'
+		);
+		$this->toopherIframe->setNonceOverride($this->getOauthNonce());
+		$expectedUrl = 'https://api.toopher.test/v1/web/authenticate?username=jdoe&reset_email=jdoe%40example.com&action_name=it+is+a+test&session_token=s9s7vsb&requester_metadata=metadata&allow_inline_pairing=false&automation_allowed=false&challenge_required=true&v=2&expires=1100&oauth_consumer_key=abcdefg&oauth_signature_method=HMAC-SHA1&oauth_version=1.0&oauth_nonce=12345678&oauth_timestamp=1000&oauth_signature=61dqeQNPFxNy8PyEFB9e5UfgN8s%3D';
+		$authenticationUrl = $this->toopherIframe->getAuthenticationUrl('jdoe', 'jdoe@example.com', $this->getRequestToken(), 'it is a test', 'metadata', $extras);
+		$this->assertTrue($authenticationUrl == $expectedUrl, 'Authentication url was incorrect');
+	}
+
+	public function testGetUserManagementUrlOnlyUsernameReturnsValidUrl()
+	{
+		$this->toopherIframe->setNonceOverride($this->getOauthNonce());
+		$expectedUrl = 'https://api.toopher.test/v1/web/manage_user?username=jdoe&reset_email=&v=2&expires=1300&oauth_consumer_key=abcdefg&oauth_signature_method=HMAC-SHA1&oauth_version=1.0&oauth_nonce=12345678&oauth_timestamp=1000&oauth_signature=SA7CAUj%2B5QcGO%2BMmdPv9ubbaozk%3D';
+		$userManagementUrl = $this->toopherIframe->getUserManagementUrl('jdoe');
+		$this->assertTrue($userManagementUrl == $expectedUrl, 'User management url was incorrect');
+	}
+
+	public function testToopherIframeGetUserManagementUrlWithEmailReturnsValidUrl()
+	{
+		$this->toopherIframe->setNonceOverride($this->getOauthNonce());
+		$expectedUrl = 'https://api.toopher.test/v1/web/manage_user?username=jdoe&reset_email=jdoe%40example.com&v=2&expires=1300&oauth_consumer_key=abcdefg&oauth_signature_method=HMAC-SHA1&oauth_version=1.0&oauth_nonce=12345678&oauth_timestamp=1000&oauth_signature=NjwH5yWPE2CCJL8v%2FMNknL%2BeTpE%3D';
+		$userManagementUrl = $this->toopherIframe->getUserManagementUrl('jdoe', 'jdoe@example.com');
+		$this->assertTrue($userManagementUrl == $expectedUrl, 'User management url was incorrect');
+	}
+
+	public function testToopherIframeGetUserManagementUrlWithEmailAndExtrasReturnsValidUrl()
+	{
+		$extras = array('ttl' => '100');
+		$this->toopherIframe->setNonceOverride($this->getOauthNonce());
+		$expectedUrl = 'https://api.toopher.test/v1/web/manage_user?username=jdoe&reset_email=jdoe%40example.com&v=2&expires=1100&oauth_consumer_key=abcdefg&oauth_signature_method=HMAC-SHA1&oauth_version=1.0&oauth_nonce=12345678&oauth_timestamp=1000&oauth_signature=sV8qoKnxJ3fxfP6AHNa0eNFxzJs%3D';
+		$userManagementUrl = $this->toopherIframe->getUserManagementUrl('jdoe', 'jdoe@example.com', $extras);
+		$this->assertTrue($userManagementUrl == $expectedUrl, 'User management url was incorrect');
+	}
+
+	public function testProcessPostbackReturnsAuthenticationRequest()
+	{
+		$authData = $this->getUrlencodedData($this->getAuthenticationRequestData());
+		$authRequest = $this->toopherIframe->processPostback($authData, $this->getRequestToken());
+		$this->assertTrue($authRequest->id == '1', 'Authentication request id was incorrect');
+		$this->assertTrue($authRequest->pending == false, 'Authentication request should not be pending');
+		$this->assertTrue($authRequest->granted == true, 'Authentication request should be granted');
+		$this->assertTrue($authRequest->automated == false, 'Authentication request should not be automated');
+		$this->assertTrue($authRequest->reason_code == '100', 'Authentication request reason code was incorrect');
+		$this->assertTrue($authRequest->reason == 'it is a test', 'Authentication request reason was incorrect');
+		$this->assertTrue($authRequest->terminal->id == '1', 'Terminal id was incorrect');
+		$this->assertTrue($authRequest->terminal->name == 'terminal name', 'Terminal name was incorrect');
+		$this->assertTrue($authRequest->terminal->requester_specified_id == 'requester specified id', 'Terminal requester specified id was incorrect');
+		$this->assertTrue($authRequest->user->id == '1', 'User id was incorrect');
+		$this->assertTrue($authRequest->user->name == 'user name', 'User name was incorrect');
+		$this->assertTrue($authRequest->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+		$this->assertTrue($authRequest->action->id == '1', 'Action id was incorrect');
+		$this->assertTrue($authRequest->action->name == 'action name', 'Action name was incorrect');
+	}
+
+	public function testProcessPostbackReturnsPairing()
+	{
+		$pairingData = $this->getUrlencodedData($this->getPairingData());
+		$pairing = $this->toopherIframe->processPostback($pairingData, $this->getRequestToken());
+		$this->assertTrue($pairing->id == '1', 'Pairing id was incorrect');
+		$this->assertTrue($pairing->enabled == true, 'Pairing should be enabled');
+		$this->assertTrue($pairing->pending == false, 'Pairing should not be pending');
+		$this->assertTrue($pairing->user->id == '1', 'User id was incorrect');
+		$this->assertTrue($pairing->user->name == 'user name', 'User name was incorrect');
+		$this->assertTrue($pairing->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+	}
+
+	public function testProcessPostbackReturnsUser()
+	{
+		$userData = $this->getUrlencodedData($this->getUserData());
+		$user = $this->toopherIframe->processPostback($userData, $this->getRequestToken());
+		$this->assertTrue($user->id == '1', 'User id was incorrect');
+		$this->assertTrue($user->name == 'user name', 'User name was incorrect');
+		$this->assertTrue($user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+	}
+
+	public function testProcessPostbackWithExtrasReturnsAuthenticationRequest()
+	{
+		$extras = array('ttl' => '5');
+		$authRequest = $this->toopherIframe->processPostback($this->getUrlencodedData($this->getAuthenticationRequestData()), $this->getRequestToken(), $extras);
+		$this->assertTrue(is_a($authRequest, 'AuthenticationRequest'), 'AuthenticationRequest should be returned');
+	}
+
+	public function testProcessPostbackWithoutRequestTokenReturnsAuthenticationRequest()
+	{
+		$authRequest = $this->toopherIframe->processPostback($this->getUrlencodedData($this->getAuthenticationRequestData()));
+		$this->assertTrue(is_a($authRequest, 'AuthenticationRequest'), 'AuthenticationRequest should be returned');
+	}
+
+	public function testProcessPostbackWithKeyWithEmptyValueReturnsAuthenticationRequest()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['requester_metadata'] = '';
+		$authData['toopher_sig'] = '2CQouLu8dL3OA8N/mgHK6eeYHm4=';
+		$authRequest = $this->toopherIframe->processPostback($this->getUrlEncodedData($authData));
+		$this->assertTrue(is_a($authRequest, 'AuthenticationRequest'), 'AuthenticationRequest should be returned');
+	}
+
+	/**
+	* @expectedException         SignatureValidationError
+	* @expectedExceptionMessage  Computed signature does not match
+	*/
+	public function testProcessPostbackWithBadSignatureRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['toopher_sig'] = 'invalid';
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException         SignatureValidationError
+	* @expectedExceptionMessage  TTL Expired
+	*/
+	public function testProcessPostbackWithExpiredSignatureRaisesError()
+	{
+		$this->toopherIframe->setTimeStampOverride(null);
+		$authData = $this->getAuthenticationRequestData();
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException        SignatureValidationError
+	* @expectedExceptionMessage Missing required keys: toopher_sig
+	*/
+	public function testProcessPostbackMissingSignatureRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		unset($authData['toopher_sig']);
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException        SignatureValidationError
+	* @expectedExceptionMessage Missing required keys: timestamp
+	*/
+	public function testProcessPostbackMissingTimestampRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		unset($authData['timestamp']);
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException        SignatureValidationError
+	* @expectedExceptionMessage Missing required keys: session_token
+	*/
+	public function testProcessPostbackMissingSessionTokenRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		unset($authData['session_token']);
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException        SignatureValidationError
+	* @expectedExceptionMessage Session token does not match expected value
+	*/
+	public function testProcessPostbackWithInvalidSessionTokenRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['session_token'] = 'invalid';
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	The postback resource type is not valid: invalid
+	*/
+	public function testProcessPostbackWithInvalidResourceTypeRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['resource_type'] = 'invalid';
+		$authData['toopher_sig'] = 'xEY+oOtJcdMsmTLp6eOy9isO/xQ=';
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	The specified user has disabled Toopher authentication
+	*/
+	public function testProcessPostbackWithErrorCodeRaisesError()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['error_code'] = '704';
+		$authData['error_message'] = 'The specified user has disabled Toopher authentication';
+		$this->toopherIframe->processPostback($this->getUrlencodedData($authData), $this->getRequestToken());
+	}
+
+	/**
+	* @expectedException SignatureValidationError
+	* @expectedExceptionMessage Error while calculating signature:
+	*/
+	public function testProcessPostbackWithBadSecretRaisesError()
+	{
+		$toopherIframe = new ToopherIframe('key', array('hi'), 'https://api.toopher.test/v1/');
+		$toopherIframe->setTimeStampOverride($this->getOauthTimestamp());
+		$toopherIframe->setNonceOverride($this->getOauthNonce());
+		$toopherIframe->processPostback($this->getUrlencodedData($this->getAuthenticationRequestData()), $this->getRequestToken());
+	}
+
+	public function testIsAuthenticationGrantedWithAuthenticationRequestGrantedReturnsTrue()
+	{
+		$this->assertTrue($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($this->getAuthenticationRequestData()), $this->getRequestToken()));
+	}
+
+	public function testIsAuthenticationGrantedWithAuthenticationRequestGrantedAndExtrasReturnsTrue()
+	{
+		$extras = array('ttl' => '100');
+		$this->assertTrue($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($this->getAuthenticationRequestData()), $this->getRequestToken(), $extras));
+	}
+
+	public function testIsAuthenticationGrantedWithAuthenticationRequestGrantedWithoutRequestTokenReturnsTrue()
+	{
+		$this->assertTrue($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($this->getAuthenticationRequestData())));
+	}
+
+	public function testIsAuthenticationGrantedWithAuthenticationRequestNotGrantedReturnsFalse()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['granted'] = 'false';
+		$authData['toopher_sig'] = 'nADNKdly9zA2IpczD6gvDumM48I=';
+		$this->assertFalse($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($authData), $this->getRequestToken()));
+	}
+
+	public function testIsAuthenticationGrantedWithPairingReturnsFalse()
+	{
+		$this->assertFalse($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($this->getPairingData(), $this->getRequestToken())));
+	}
+
+	public function testIsAuthenticationGrantedWithUserReturnsFalse()
+	{
+		$this->assertFalse($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($this->getUserData(), $this->getRequestToken())));
+	}
+
+	public function testIsAuthenticationGrantedWithSignatureValidationErrorReturnsFalse()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		unset($authData['id']);
+		$this->assertFalse($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($authData), $this->getRequestToken()));
+	}
+
+	public function testIsAuthenticationGrantedWithToopherRequestExceptionReturnsFalse()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['resource_type'] = 'invalid';
+		$authData['toopher_sig'] = 'xEY+oOtJcdMsmTLp6eOy9isO/xQ=';
+		$this->assertFalse($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($authData), $this->getRequestToken()));
+	}
+
+	public function testIsAuthenticationGrantedWithErrorCode704ReturnsTrue()
+	{
+		$authData = $this->getAuthenticationRequestData();
+		$authData['error_code'] = '704';
+		$authData['error_message'] = 'The specified user has disabled Toopher authentication';
+		$this->assertTrue($this->toopherIframe->isAuthenticationGranted($this->getUrlencodedData($authData)));
+	}
+}
diff --git a/test/UserTerminalTest.php b/test/UserTerminalTest.php
new file mode 100644
index 0000000..1df7e69
--- /dev/null
+++ b/test/UserTerminalTest.php
@@ -0,0 +1,112 @@
+<?php
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class UserTerminalTests extends PHPUnit_Framework_TestCase {
+	protected function setUp()
+	{
+		$this->mock = new HTTP_Request2_Adapter_Mock();
+	}
+
+	protected function getUserTerminalJson()
+	{
+		return [
+			'id' => '1',
+			'name' => 'terminal name',
+			'requester_specified_id' => 'requester specified id',
+			'user' => [
+				'id' => '1',
+				'name' => 'user name',
+				'toopher_authentication_enabled' => true
+			]
+		];
+	}
+
+	protected function getToopherApi($mock = NULL)
+	{
+		return new ToopherApi('key', 'secret', '', $mock);
+	}
+
+	protected function getUserTerminal($api)
+	{
+		return new UserTerminal($this->getUserTerminalJson(), $api);
+	}
+
+	public function testUserTerminalCreatesUserTerminal(){
+		$userTerminal = $this->getUserTerminal($this->getToopherApi());
+		$this->assertTrue($userTerminal->id == '1', 'Terminal id was incorrect');
+		$this->assertTrue($userTerminal->name == 'terminal name', 'Terminal name was incorrect');
+		$this->assertTrue($userTerminal->requester_specified_id == 'requester specified id', 'Terminal requester_specified_id was incorrect');
+		$this->assertTrue($userTerminal->user->id == '1', 'User id was incorrect');
+		$this->assertTrue($userTerminal->user->name == 'user name', 'User name was incorrect');
+		$this->assertTrue($userTerminal->user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+	}
+
+	public function testUserTerminalRefreshFromServerUpdatesUserTerminal(){
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/user_terminals/1');
+		$resp->appendBody('{"id":"1", "name":"terminal name changed", "requester_specified_id":"requester specified id changed", "user":{"id":"1", "name":"user name changed", "toopher_authentication_enabled":false}}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$userTerminal = $this->getUserTerminal($toopher);
+
+		$userTerminal->refreshFromServer();
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'GET', "Last called method should be 'GET'");
+		$this->assertTrue($userTerminal->name == 'terminal name changed', 'Terminal name was wrong');
+		$this->assertTrue($userTerminal->requester_specified_id == 'requester specified id changed', 'Terminal requester_specified_id was incorrect');
+		$this->assertTrue($userTerminal->user->name == 'user name changed', 'User name was incorrect');
+		$this->assertTrue($userTerminal->user->toopher_authentication_enabled == false, 'User should not be toopher_authentication_enabled');
+	}
+
+	public function testUserTerminalUpdateChangesUserTerminal(){
+		$userTerminal = $this->getUserTerminal($this->getToopherApi());
+		$userTerminal->update(['id'=>'1', 'name'=>'terminal name changed', 'requester_specified_id'=>'requester specified id changed', 'user'=>['id'=>'1', 'name'=>'user name changed', 'toopher_authentication_enabled'=>false]]);
+		$this->assertTrue($userTerminal->name == 'terminal name changed', 'Terminal name was wrong');
+		$this->assertTrue($userTerminal->requester_specified_id == 'requester specified id changed', 'Terminal requester_specified_id was incorrect');
+		$this->assertTrue($userTerminal->user->name == 'user name changed', 'User name was incorrect');
+		$this->assertTrue($userTerminal->user->toopher_authentication_enabled == false, 'User should not be toopher_authentication_enabled');
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse user terminal from response
+	*/
+	public function testUserTerminalMissingKeyFails()
+	{
+		$userTerminalJson = $this->getUserTerminalJson();
+		unset($userTerminalJson['id']);
+		new UserTerminal($userTerminalJson, $this->getToopherApi());
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse user terminal from response
+	*/
+	public function testUserTerminalUpdateMissingKeyFails()
+	{
+		$userTerminal = $this->getUserTerminal($this->getToopherApi());
+		$userTerminal->update(['id'=>'1', 'requester_specified_id'=>'requester specified id changed', 'user'=>['id'=>'1', 'name'=>'user name changed', 'toopher_authentication_enabled'=>false]]);
+	}
+
+}
+
+?>
diff --git a/test/UserTest.php b/test/UserTest.php
new file mode 100644
index 0000000..22345d5
--- /dev/null
+++ b/test/UserTest.php
@@ -0,0 +1,126 @@
+<?php
+/*
+Copyright (c) 2012 Toopher, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+class UserTests extends PHPUnit_Framework_TestCase {
+
+	protected function setUp()
+	{
+		$this->mock = new HTTP_Request2_Adapter_Mock();
+	}
+
+	protected function getToopherApi($mock = NULL)
+	{
+		return new ToopherApi('key', 'secret', '', $mock);
+	}
+
+	protected function getUser($api)
+	{
+		return new User(['id' => '1', 'name' => 'user', 'toopher_authentication_enabled' => true], $api);
+	}
+
+	public function testUserCreatesUser()
+	{
+		$user = $this->getUser($this->getToopherApi());
+		$this->assertTrue($user->id == '1', 'User id was incorrect');
+		$this->assertTrue($user->name == 'user', 'User name was incorrect');
+		$this->assertTrue($user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+	}
+
+	public function testUserRefreshFromServerUpdatesUser()
+	{
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users/1');
+		$resp->appendBody('{"id":"1","name":"user changed","toopher_authentication_enabled":true}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$user = $this->getUser($toopher);
+
+		$user->refreshFromServer();
+		$this->assertTrue($user->id == '1', 'bad user id');
+		$this->assertTrue($user->name == 'user changed', 'bad user name');
+		$this->assertTrue($user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+	}
+
+	public function testUserEnableToopherAuthenticationPostsToCorrectUrl()
+	{
+		$resp = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users/1');
+		$resp->appendBody('{"id":"1","name":"user","toopher_authentication_enabled":true}');
+		$this->mock->addResponse($resp);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$user = new User(['id' => '1', 'name' => 'user', 'toopher_authentication_enabled' => false], $toopher);
+		$this->assertTrue($user->toopher_authentication_enabled == false, 'User should not be toopher_authentication_enabled');
+
+		$user->enableToopherAuthentication();
+		$this->assertTrue($user->toopher_authentication_enabled == true, 'toopher authentication should be enabled');
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getBody() == 'toopher_authentication_enabled=true', "Post params should include 'toopher_authentication_enabled=true'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == 'https://api.toopher.com/v1/users/1', "Last called url should be 'https://api.toopher/v1/users/1'");
+	}
+
+	public function testUserDisableToopherAuthenticationPostsToCorrectUrl()
+	{
+		$resp1 = new HTTP_Request2_Response('HTTP/1.1 200 OK', false, 'https://api.toopher.com/v1/users/1');
+		$resp1->appendBody('{"id":"1","name":"user","toopher_authentication_enabled":false}');
+		$this->mock->addResponse($resp1);
+
+		$toopher = $this->getToopherApi($this->mock);
+		$user = $this->getUser($toopher);
+		$this->assertTrue($user->toopher_authentication_enabled == true, 'User should be toopher_authentication_enabled');
+
+		$user->disableToopherAuthentication();
+		$this->assertTrue($user->toopher_authentication_enabled == false, 'toopher authentication should not be enabled');
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getBody() == 'toopher_authentication_enabled=false', "Post params should include'toopher_authentication_enabled=false'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getMethod() == 'POST', "Last called method should be 'POST'");
+		$this->assertTrue($toopher->advanced->raw->getOauthConsumer()->getLastRequest()->getUrl() == 'https://api.toopher.com/v1/users/1', "Last called url should be 'https://api.toopher/v1/users/1'");
+	}
+
+	public function testUserUpdateChangesUser()
+	{
+		$user = $this->getUser($this->getToopherApi());
+		$user->update(['id' => '1', 'name' => 'user changed', 'toopher_authentication_enabled' => false]);
+		$this->assertTrue($user->name == 'user changed', 'User name was incorrect');
+		$this->assertTrue($user->toopher_authentication_enabled == false, 'User should not be toopher_authentication_enabled');
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse user from response
+	*/
+	public function testUserMissingKeyFails()
+	{
+		$user = new User(['name' => 'user', 'toopher_authentication_enabled' => true], $this->getToopherApi());
+	}
+
+	/**
+	* @expectedException		ToopherRequestException
+	* @expectedExceptionMessage	Could not parse user from response
+	*/
+	public function testUserUpdateMissingKeyFails()
+	{
+		$user = $this->getUser($this->getToopherApi());
+		$user->update(['id' => '1', 'toopher_authentication_enabled' => false]);
+	}
+}
+
+?>
diff --git a/test/bootstrap.php b/test/bootstrap.php
index c1c1e80..8ef7e4a 100644
--- a/test/bootstrap.php
+++ b/test/bootstrap.php
@@ -1,5 +1,11 @@
 <?php
 $base = realpath(dirname(__FILE__) . '/..');
-require_once "$base/lib/toopher_api.php";
+require_once "$base/lib/ToopherApi.php";
+require_once "$base/lib/ToopherIframe.php";
+require_once "$base/lib/Pairing.php";
+require_once "$base/lib/AuthenticationRequest.php";
+require_once "$base/lib/User.php";
+require_once "$base/lib/UserTerminal.php";
+require_once "$base/lib/Action.php";
 require_once "$base/vendor/autoload.php";
 ?>
diff --git a/test/test_toopher_api.php b/test/test_toopher_api.php
deleted file mode 100644
index e89e9ff..0000000
--- a/test/test_toopher_api.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
-Copyright (c) 2012 Toopher, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-require_once("bootstrap.php");
-
-class ToopherAPITests extends PHPUnit_Framework_TestCase {
-
-    protected $oauthParams = array('oauth_nonce' => 'nonce', 'oauth_timestamp' => '0');
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testEmptyKeyThrowsException() {
-        $toopher = new ToopherAPI('', 'secret');
-    }
-
-    /**
-     * @expectedException InvalidArgumentException
-     */
-    public function testEmptySecretThrowsException() {
-        $toopher = new ToopherAPI('key', '');
-    }
-
-    public function testCanCreateToopherApiWithArguments() {
-        $toopher = new ToopherAPI('key', 'secret');
-    }
-
-    public function testCreatePair(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp = new HTTP_Request2_Response("HTTP/1.1 200 OK", false, 'https://api.toopher.com/v1/pairings/create');
-        $resp->appendBody('{"id":"1","enabled":true,"user":{"id":"1","name":"user"}}');
-        $mock->addResponse($resp);
-        $toopher = new ToopherAPI('key', 'secret', '', $mock, $this->oauthParams);
-        $pairing = $toopher->pair('immediate_pair', 'user');
-        $this->assertTrue($pairing['id'] == '1', 'bad pairing id');
-        $this->assertTrue($pairing['enabled'] == true, 'pairing not enabled');
-        $this->assertTrue($pairing['userId'] == '1', 'bad user id');
-        $this->assertTrue($pairing['userName'] == 'user', 'bad user name');
-    }
-
-    public function testGetPairingStatus(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp1 = new HTTP_Request2_Response("HTTP/1.1 200 OK", false, 'https://api.toopher.com/v1/pairings/1');
-        $resp1->appendBody('{"id":"1","enabled":true,"user":{"id":"1","name":"paired user"}}');
-        $resp2 = new HTTP_Request2_Response("HTTP/1.1 200 OK", false, 'https://api.toopher.com/v1/pairings/1');
-        $resp2->appendBody('{"id":"2","enabled":false,"user":{"id":"2","name":"unpaired user"}}');
-        $mock->addResponse($resp1);
-        $mock->addResponse($resp2);
-        $toopher = new ToopherAPI('key', 'secret', '', $mock);
-
-        $pairing = $toopher->getPairingStatus('1');
-        $this->assertTrue($pairing['id'] == '1', 'bad pairing id');
-        $this->assertTrue($pairing['enabled'] == true, 'pairing not enabled');
-        $this->assertTrue($pairing['userId'] == '1', 'bad user id');
-        $this->assertTrue($pairing['userName'] == 'paired user', 'bad user name');
-
-        $pairing = $toopher->getPairingStatus('2');
-        $this->assertTrue($pairing['id'] == '2', 'bad pairing id');
-        $this->assertTrue($pairing['enabled'] == false, 'pairing not enabled');
-        $this->assertTrue($pairing['userId'] == '2', 'bad user id');
-        $this->assertTrue($pairing['userName'] == 'unpaired user', 'bad user name');
-    }
-
-    public function testCreateAuthenticationWithNoAction(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp1 = new HTTP_Request2_Response("HTTP/1.1 200 OK", false, 'https://api.toopher.com/v1/authentication_requests/initiate');
-        $resp1->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason":"some reason","terminal":{"id":"1","name":"term name"}}');
-        $mock->addResponse($resp1);
-
-        $toopher = new ToopherAPI('key', 'secret', '', $mock);
-        $auth = $toopher->authenticate('1', 'term name');
-        $this->assertTrue($auth['id'] == '1', 'wrong auth id');
-        $this->assertTrue($auth['pending'] == false, 'wrong auth pending');
-        $this->assertTrue($auth['granted'] == true, 'wrong auth granted');
-        $this->assertTrue($auth['automated'] == true, 'wrong auth automated');
-        $this->assertTrue($auth['reason'] == 'some reason', 'wrong auth reason');
-        $this->assertTrue($auth['terminalId'] == '1', 'wrong auth terminal id');
-        $this->assertTrue($auth['terminalName'] == 'term name', 'wrong auth terminal name');
-    }
-
-    public function testGetAuthenticationStatus(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp1 = new HTTP_Request2_Response("HTTP/1.1 200 OK", false, 'https://api.toopher.com/v1/authentication_requests/1');
-        $resp1->appendBody('{"id":"1","pending":false,"granted":true,"automated":true,"reason":"some reason","terminal":{"id":"1","name":"term name"}}');
-        $resp2 = new HTTP_Request2_Response("HTTP/1.1 200 OK", false, 'https://api.toopher.com/v1/authentication_requests/2');
-        $resp2->appendBody('{"id":"2","pending":true,"granted":false,"automated":false,"reason":"some other reason","terminal":{"id":"2","name":"another term name"}}');
-        $mock->addResponse($resp1);
-        $mock->addResponse($resp2);
-
-        $toopher = new ToopherAPI('key', 'secret', '', $mock);
-        $auth = $toopher->getAuthenticationStatus('1');
-        $this->assertTrue($auth['id'] == '1', 'wrong auth id');
-        $this->assertTrue($auth['pending'] == false, 'wrong auth pending');
-        $this->assertTrue($auth['granted'] == true, 'wrong auth granted');
-        $this->assertTrue($auth['automated'] == true, 'wrong auth automated');
-        $this->assertTrue($auth['reason'] == 'some reason', 'wrong auth reason');
-        $this->assertTrue($auth['terminalId'] == '1', 'wrong auth terminal id');
-        $this->assertTrue($auth['terminalName'] == 'term name', 'wrong auth terminal name');
-
-        $auth = $toopher->getAuthenticationStatus('2');
-        $this->assertTrue($auth['id'] == '2', 'wrong auth id');
-        $this->assertTrue($auth['pending'] == true, 'wrong auth pending');
-        $this->assertTrue($auth['granted'] == false, 'wrong auth granted');
-        $this->assertTrue($auth['automated'] == false, 'wrong auth automated');
-        $this->assertTrue($auth['reason'] == 'some other reason', 'wrong auth reason');
-        $this->assertTrue($auth['terminalId'] == '2', 'wrong auth terminal id');
-        $this->assertTrue($auth['terminalName'] == 'another term name', 'wrong auth terminal name');
-    }
-
-    /**
-     * @expectedException ToopherRequestException
-     */
-    public function testToopherRequestException(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp1 = new HTTP_Request2_Response("HTTP/1.1 401 Unauthorized", false, 'https://api.toopher.com/v1/authentication_requests/1');
-        $resp1->appendBody('{"error_code":401, "error_message":"Not a valid OAuth signed request"}');
-        $mock->addResponse($resp1);
-
-
-        $toopher = new ToopherAPI('key', 'secret', '', $mock);
-        $auth = $toopher->getAuthenticationStatus('1');
-    }
-
-    public function testToopherVersionStringExists() {
-        $this->assertNotEmpty(ToopherAPI::VERSION, 'no version string');
-        list($major, $minor, $patch) = explode('.', ToopherAPI::VERSION);
-        $this->assertGreaterThanOrEqual(1, (int)$major);
-        $this->assertGreaterThanOrEqual(0, (int)$minor);
-        $this->assertGreaterThanOrEqual(0, (int)$patch);
-    }
-
-    /**
-     * @expectedException ToopherRequestException
-     */
-    public function test400WithEmptyBodyRaisesToopherRequestException(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp1 = new HTTP_Request2_Response("HTTP/1.1 403 Forbidden", false, 'https://api.toopher.com/v1/authentication_requests/1');
-        $mock->addResponse($resp1);
-        $toopher = new ToopherAPI('key', 'secret', '', $mock);
-        $auth = $toopher->getAuthenticationStatus('1');
-    }
-
-    /**
-     * @expectedException ToopherRequestException
-     */
-    public function test400WithUnprintableBodyRaisesToopherRequestException(){
-        $mock = new HTTP_Request2_Adapter_Mock();
-        $resp1 = new HTTP_Request2_Response("HTTP/1.1 403 Forbidden", false, 'https://api.toopher.com/v1/authentication_requests/1');
-        $resp1->appendBody(sprintf('{"error_code":403, "error_message":"%c"}', chr(5)));
-        $mock->addResponse($resp1);
-        $toopher = new ToopherAPI('key', 'secret', '', $mock);
-        $auth = $toopher->getAuthenticationStatus('1');
-    }
-}
-
-?>