diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..8bf57f5
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,34 @@
+{
+  "version": "0.2.0",
+  "configurations":[
+    {
+      "type": "node",
+      "name": "vscode-jest-tests",
+      "request": "launch",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "cwd": "${workspaceFolder}",
+      "args": [
+        "unit",
+        "--runInBand",
+        "--watchAll=false"
+      ]
+    },
+    {
+      "type": "node",
+      "name": "vscode-jest-tests-windows",
+      "request": "launch",
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "program": "${workspaceRoot}/node_modules/jest/bin/jest.js",
+      "cwd": "${workspaceFolder}",
+      "args": [
+        "--runInBand",
+        "--watchAll=false"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..64e6d52
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+  "jest.jestCommandLine": "./node_modules/.bin/jest --runInBand",
+  "svg.preview.background": "custom"
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index b10d215..cf2289a 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,12 @@ let changeset = Changeset(user, validatorFn);
 user.firstName; // "Michael"
 user.lastName; // "Bolton"
 
-changeset.set('firstName', 'Jim');
-changeset.set('lastName', 'B');
-changeset.get('isInvalid'); // true
-changeset.get('errors'); // [{ key: 'lastName', validation: 'too short', value: 'B' }]
-changeset.set('lastName', 'Bob');
-changeset.get('isValid'); // true
+changeset.content.firstName =  'Jim';
+changeset.content.lastName =  'B';
+changeset.isInvalid; // true
+changeset.errors; // [{ key: 'lastName', validation: 'too short', value: 'B' }]
+changeset.content.lastName =  'Bob';
+changeset.isValid; // true
 
 user.firstName; // "Michael"
 user.lastName; // "Bolton"
@@ -53,10 +53,17 @@ In the above example, when the input changes, only the changeset's internal valu
 
 On rollback, all changes are dropped and the underlying Object is left untouched.
 
+## Structure
+
+![Structure drawing](./structure.drawio.svg?sanitize=true "Structure")
+
 ## Full API
 
 ```js
-Changeset(model, lookupValidator(validationMap), validationMap, { skipValidate: boolean, changesetKeys: string[] });
+changeset(model); // simplest
+
+changeset(model, lookupValidator(validationMap), validationMap, { skipValidate: boolean, changesetKeys: string[] });
+
 ```
 
 - `model` (required)
@@ -81,14 +88,13 @@ Changeset(model, lookupValidator(validationMap), validationMap, { skipValidate:
   + [`change`](#change)
   + [`errors`](#errors)
   + [`changes`](#changes)
-  + [`data`](#data)
+  + [`content`](#content)
+  + [`originalContent`](#originalcontent)
   + [`isValid`](#isvalid)
   + [`isInvalid`](#isinvalid)
   + [`isPristine`](#ispristine)
   + [`isDirty`](#isdirty)
 * Methods
-  + [`get`](#get)
-  + [`set`](#set)
   + [`prepare`](#prepare)
   + [`execute`](#execute)
   + [`save`](#save)
@@ -253,15 +259,54 @@ You can use this property to render a list of changes:
 
 **[⬆️ back to top](#api)**
 
-#### `data`
+#### `content`
 
-Returns the Object that was wrapped in the changeset.
+Returns an Proxy representing `originalContent` plus all the current changes.
+
+You can call `asChangeset` on the proxy to get back to this changeset api. You can do this on any child object in the tree to get a changeset that you can pass
+for example to a child component. This is the only property on the proxy that will conflict with your object's API. All other property and methods will be
+passed through to your object.
+
+In this way a child component can see its changes and validation errors scoped
+only to this proxied object.
+
+```hbs
+{{#each this.changeset.content.people as |person|}}
+  <p>{{person.name}}</p>
+  <AddressEditor @address={{person.address.asChangeset}}/>
+{{/each}}
+```
 
 ```js
 let user = { name: 'Bobby', age: 21, address: { zipCode: '10001' } };
 let changeset = Changeset(user);
 
-changeset.get('data'); // user
+changeset.content.age = 17;
+```
+
+**[⬆️ back to top](#api)**
+
+
+```js
+let user = { name: 'Bobby', age: 21, address: { zipCode: '10001' } };
+let changeset = Changeset(user);
+
+changeset.content.age = 17;
+```
+
+**[⬆️ back to top](#api)**
+
+#### `originalContent`
+
+Returns the Object that was wrapped in the changeset without any 
+pending changes applied.
+
+```js
+let user = { name: 'Bobby', age: 21, address: { zipCode: '10001' } };
+let changeset = Changeset(user);
+
+changeset.content.age = 45;
+changeset.originalContent.age; // 21
 ```
 
 **[⬆️ back to top](#api)**
@@ -271,7 +316,7 @@ changeset.get('data'); // user
 Returns a Boolean value of the changeset's validity.
 
 ```js
-changeset.get('isValid'); // true
+changeset.isValid; // true
 ```
 
 You can use this property in the template:
@@ -289,7 +334,7 @@ You can use this property in the template:
 Returns a Boolean value of the changeset's (in)validity.
 
 ```js
-changeset.get('isInvalid'); // true
+changeset.isInvalid; // true
 ```
 
 You can use this property in the template:
@@ -307,7 +352,7 @@ You can use this property in the template:
 Returns a Boolean value of the changeset's state. A pristine changeset is one with no changes.
 
 ```js
-changeset.get('isPristine'); // true
+changeset.isPristine; // true
 ```
 
 If changes present on the changeset are equal to the content's, this will return `true`. However, note that key/value pairs in the list of changes must all be present and equal on the content, but not necessarily vice versa:
@@ -315,14 +360,14 @@ If changes present on the changeset are equal to the content's, this will return
 ```js
 let user = { name: 'Bobby', age: 21, address: { zipCode: '10001' } };
 
-changeset.set('name', 'Bobby');
-changeset.get('isPristine'); // true
+changeset.content.name =  'Bobby';
+changeset.isPristine; // true
 
-changeset.set('address.zipCode', '10001');
-changeset.get('isPristine'); // true
+changeset.content.address.zipCode =  '10001';
+changeset.isPristine; // true
 
-changeset.set('foo', 'bar');
-changeset.get('isPristine'); // false
+changeset.content.foo =  'bar';
+changeset.isPristine; // false
 ```
 
 **[⬆️ back to top](#api)**
@@ -332,68 +377,11 @@ changeset.get('isPristine'); // false
 Returns a Boolean value of the changeset's state. A dirty changeset is one with changes.
 
 ```js
-changeset.get('isDirty'); // true
+changeset.isDirty; // true
 ```
 
 **[⬆️ back to top](#api)**
 
-#### `get`
-
-Exactly the same semantics as `Ember.get`. This proxies first to the error value, the changed value, and finally to the underlying Object.
-
-```js
-changeset.get('firstName'); // "Jim"
-changeset.set('firstName', 'Billy'); // "Billy"
-changeset.get('firstName'); // "Billy"
-
-changeset.get('address.zipCode'); // "10001"
-changeset.set('address.zipCode', '94016'); // "94016"
-changeset.get('address.zipCode'); // "94016"
-```
-
-You can use and bind this property in the template:
-
-```hbs
-{{input value=changeset.firstName}}
-```
-
-Note that using `Ember.get` **will not necessarily work if you're expecting an Object**. On the other hand, using `changeset.get` will work just fine:
-
-```js
-get(changeset, 'momentObj').format('dddd'); // will error, format is undefined
-changeset.get('momentObj').format('dddd');  // => "Friday"
-```
-
-This is because `Changeset` wraps an Object with `Ember.ObjectProxy` internally, and overrides `Ember.Object.get` to hide this implementation detail.
-
-Because an Object is wrapped with `Ember.ObjectProxy`, the following (although more verbose) will also work:
-
-```js
-get(changeset, 'momentObj.content').format('dddd'); // => "Friday"
-```
-
-**[⬆️ back to top](#api)**
-
-#### `set`
-
-Exactly the same semantics as `Ember.set`. This stores the change on the changeset. It is recommended to use `changeset.set(...)` instead of `Ember.set(changeset, ...)`.  `Ember.set` will set the property for nested keys on the underlying model.
-
-```js
-changeset.set('firstName', 'Milton'); // "Milton"
-changeset.set('address.zipCode', '10001'); // "10001"
-```
-
-You can use and bind this property in the template:
-
-```hbs
-{{input value=changeset.firstName}}
-{{input value=changeset.address.country}}
-```
-
-Any updates on this value will only store the change on the changeset, even with 2 way binding.
-
-**[⬆️ back to top](#api)**
-
 #### `prepare`
 
 Provides a function to run before emitting changes to the model. The callback function must return a hash in the same shape:
@@ -524,8 +512,8 @@ Rolls back unsaved changes for the specified property only. All other changes wi
 ```js
 // user = { firstName: "Jim", lastName: "Bob" };
 let changeset = Changeset(user);
-changeset.set('firstName', 'Jimmy');
-changeset.set('lastName', 'Fallon');
+changeset.content.firstName =  'Jimmy';
+changeset.content.lastName =  'Fallon';
 changeset.rollbackProperty('lastName'); // returns changeset
 changeset.execute();
 user.firstName; // "Jimmy"
@@ -554,7 +542,7 @@ let validationMap = {
 };
 
 let changeset = Changeset(user, validatorFn, validationMap);
-changeset.get('isValid'); // true
+changeset.isValid; // true
 
 // validate single field; returns Promise
 changeset.validate('lastName');
@@ -564,11 +552,11 @@ changeset.validate('lastName', 'address.zipCode');
 
 // validate all fields; returns Promise
 changeset.validate().then(() => {
-  changeset.get('isInvalid'); // true
+  changeset.isInvalid; // true
 
   // [{ key: 'lastName', validation: 'too short', value: 'B' },
   //  { key: 'address.zipCode', validation: 'too short', value: '123' }]
-  changeset.get('errors');
+  changeset.errors;
 });
 ```
 
@@ -629,16 +617,16 @@ Restores a snapshot of changes and errors to the changeset. This overrides exist
 let user = { name: 'Adam', address: { country: 'United States' } };
 let changeset = Changeset(user, validatorFn);
 
-changeset.set('name', 'Jim Bob');
-changeset.set('address.country', 'North Korea');
+changeset.content.name =  'Jim Bob';
+changeset.content.address.country =  'North Korea';
 let snapshot = changeset.snapshot();
 
-changeset.set('name', 'Poteto');
-changeset.set('address.country', 'Australia')
+changeset.content.name =  'Poteto';
+changeset.content.address.country =  'Australia'
 
 changeset.restore(snapshot);
-changeset.get('name'); // "Jim Bob"
-changeset.get('address.country'); // "North Korea"
+changeset.name; // "Jim Bob"
+changeset.address.country; // "North Korea"
 ```
 
 **[⬆️ back to top](#api)**
@@ -651,18 +639,18 @@ Unlike `Ecto.Changeset.cast`, `cast` will take an array of allowed keys and remo
 let allowed = ['name', 'password', 'address.country'];
 let changeset = Changeset(user, validatorFn);
 
-changeset.set('name', 'Jim Bob');
-changeset.set('address.country', 'United States');
+changeset.content.name =  'Jim Bob';
+changeset.content.address.country =  'United States';
 
-changeset.set('unwantedProp', 'foo');
-changeset.set('address.unwantedProp', 123);
-changeset.get('unwantedProp'); // "foo"
-changeset.get('address.unwantedProp'); // 123
+changeset.content.unwantedProp =  'foo';
+changeset.content.address.unwantedProp =  123;
+changeset.unwantedProp; // "foo"
+changeset.address.unwantedProp; // 123
 
 changeset.cast(allowed); // returns changeset
-changeset.get('unwantedProp'); // undefined
-changeset.get('address.country'); // "United States"
-changeset.get('another.unwantedProp'); // undefined
+changeset.unwantedProp; // undefined
+changeset.address.country; // "United States"
+changeset.another.unwantedProp; // undefined
 ```
 
 For example, this method can be used to only allow specified changes through prior to saving. This is especially useful if you also setup a `schema` object for your model (using Ember Data), which can then be exported and used as a list of allowed keys:
@@ -701,9 +689,9 @@ export default Controller.extend({
 Checks to see if async validator for a given key has not resolved.  If no key is provided it will check to see if any async validator is running.
 
 ```js
-changeset.set('lastName', 'Appleseed');
-changeset.set('firstName', 'Johnny');
-changeset.set('address.city', 'Anchorage');
+changeset.content.lastName =  'Appleseed';
+changeset.content.firstName =  'Johnny';
+changeset.content.address.city =  'Anchorage';
 changeset.validate();
 
 changeset.isValidating(); // true if any async validation is still running
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 04f3e32..0000000
--- a/package-lock.json
+++ /dev/null
@@ -1,6942 +0,0 @@
-{
-  "name": "validated-changeset",
-  "version": "1.1.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.0.0"
-      }
-    },
-    "@babel/core": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.7.tgz",
-      "integrity": "sha512-jlSjuj/7z138NLZALxVgrx13AOtqip42ATZP7+kYl53GvDV6+4dCek1mVUo8z8c8Xnw/mx2q3d9HWh3griuesQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.7",
-        "@babel/helpers": "^7.7.4",
-        "@babel/parser": "^7.7.7",
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4",
-        "convert-source-map": "^1.7.0",
-        "debug": "^4.1.0",
-        "json5": "^2.1.0",
-        "lodash": "^4.17.13",
-        "resolve": "^1.3.2",
-        "semver": "^5.4.1",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/generator": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.7.tgz",
-      "integrity": "sha512-/AOIBpHh/JU1l0ZFS4kiRCBnLi6OTHzh0RPk3h9isBxkkqELtQNFi1Vr/tiG9p1yfoUdKVwISuXWQR+hwwM4VQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.7.4",
-        "jsesc": "^2.5.1",
-        "lodash": "^4.17.13",
-        "source-map": "^0.5.0"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.4.tgz",
-      "integrity": "sha512-AnkGIdiBhEuiwdoMnKm7jfPfqItZhgRaZfMg1XX3bS25INOnLPjPG1Ppnajh8eqgt5kPJnfqrRHqFqmjKDZLzQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.7.4",
-        "@babel/template": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.4.tgz",
-      "integrity": "sha512-QTGKEdCkjgzgfJ3bAyRwF4yyT3pg+vDgan8DSivq1eS0gwi+KGKE5x8kRcbeFTb/673mkO5SN1IZfmCfA5o+EA==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.7.4"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
-      "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
-      "dev": true
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.4.tgz",
-      "integrity": "sha512-guAg1SXFcVr04Guk9eq0S4/rWS++sbmyqosJzVs8+1fH5NI+ZcmkaSkc7dmtAFbHFva6yRJnjW3yAcGxjueDug==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.7.4"
-      }
-    },
-    "@babel/helpers": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.4.tgz",
-      "integrity": "sha512-ak5NGZGJ6LV85Q1Zc9gn2n+ayXOizryhjSUBTdu5ih1tlVCJeuQENzc4ItyCVhINVXvIT/ZQ4mheGIsfBkpskg==",
-      "dev": true,
-      "requires": {
-        "@babel/template": "^7.7.4",
-        "@babel/traverse": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@babel/parser": {
-      "version": "7.7.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.7.tgz",
-      "integrity": "sha512-WtTZMZAZLbeymhkd/sEaPD8IQyGAhmuTuvTzLiCFM7iXiVdY0gc0IaI+cW0fh1BnSMbJSzXX6/fHllgHKwHhXw==",
-      "dev": true
-    },
-    "@babel/plugin-syntax-object-rest-spread": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.7.4.tgz",
-      "integrity": "sha512-mObR+r+KZq0XhRVS2BrBKBpr5jqrqzlPvS9C9vuOf5ilSwzloAl7RPWLrgKdWS6IreaVrjHxTjtyqFiOisaCwg==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.4.tgz",
-      "integrity": "sha512-qUzihgVPguAzXCK7WXw8pqs6cEwi54s3E+HrejlkuWO6ivMKx9hZl3Y2fSXp9i5HgyWmj7RKP+ulaYnKM4yYxw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.4",
-        "@babel/types": "^7.7.4"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.4.tgz",
-      "integrity": "sha512-P1L58hQyupn8+ezVA2z5KBm4/Zr4lCC8dwKCMYzsa5jFMDMQAzaBNy9W5VjB+KAmBjb40U7a/H6ao+Xo+9saIw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.5.5",
-        "@babel/generator": "^7.7.4",
-        "@babel/helper-function-name": "^7.7.4",
-        "@babel/helper-split-export-declaration": "^7.7.4",
-        "@babel/parser": "^7.7.4",
-        "@babel/types": "^7.7.4",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.13"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.7.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.4.tgz",
-      "integrity": "sha512-cz5Ji23KCi4T+YIE/BolWosrJuSmoZeN1EFnRtBwF+KKLi8GG/Z2c2hOJJeCXPk4mwk4QFvTmwIodJowXgttRA==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.13",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "@cnakazawa/watch": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.3.tgz",
-      "integrity": "sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==",
-      "dev": true,
-      "requires": {
-        "exec-sh": "^0.3.2",
-        "minimist": "^1.2.0"
-      }
-    },
-    "@jest/console": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz",
-      "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
-      "dev": true,
-      "requires": {
-        "@jest/source-map": "^24.9.0",
-        "chalk": "^2.0.1",
-        "slash": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@jest/core": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz",
-      "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/reporters": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.1.15",
-        "jest-changed-files": "^24.9.0",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-resolve-dependencies": "^24.9.0",
-        "jest-runner": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "jest-watcher": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "p-each-series": "^1.0.0",
-        "realpath-native": "^1.1.0",
-        "rimraf": "^2.5.4",
-        "slash": "^2.0.0",
-        "strip-ansi": "^5.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@jest/environment": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz",
-      "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
-      "dev": true,
-      "requires": {
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0"
-      }
-    },
-    "@jest/fake-timers": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz",
-      "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0"
-      }
-    },
-    "@jest/reporters": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz",
-      "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.2",
-        "istanbul-lib-coverage": "^2.0.2",
-        "istanbul-lib-instrument": "^3.0.1",
-        "istanbul-lib-report": "^2.0.4",
-        "istanbul-lib-source-maps": "^3.0.1",
-        "istanbul-reports": "^2.2.6",
-        "jest-haste-map": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "node-notifier": "^5.4.2",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.0",
-        "string-length": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@jest/source-map": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz",
-      "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0",
-        "graceful-fs": "^4.1.15",
-        "source-map": "^0.6.0"
-      }
-    },
-    "@jest/test-result": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz",
-      "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/istanbul-lib-coverage": "^2.0.0"
-      }
-    },
-    "@jest/test-sequencer": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz",
-      "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
-      "dev": true,
-      "requires": {
-        "@jest/test-result": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-runner": "^24.9.0",
-        "jest-runtime": "^24.9.0"
-      }
-    },
-    "@jest/transform": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz",
-      "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/types": "^24.9.0",
-        "babel-plugin-istanbul": "^5.1.0",
-        "chalk": "^2.0.1",
-        "convert-source-map": "^1.4.0",
-        "fast-json-stable-stringify": "^2.0.0",
-        "graceful-fs": "^4.1.15",
-        "jest-haste-map": "^24.9.0",
-        "jest-regex-util": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "pirates": "^4.0.1",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.1",
-        "write-file-atomic": "2.4.1"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "@jest/types": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz",
-      "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
-      "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^13.0.0"
-      }
-    },
-    "@rollup/plugin-typescript": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-typescript/-/plugin-typescript-2.0.1.tgz",
-      "integrity": "sha512-UA/bN/DlHN19xdOllXmp7G7pM2ac9dQMg0q2T1rg4Bogzb7oHXj2WGafpiNpEm54PivcJdzGRJvRnI6zCISW3w==",
-      "dev": true,
-      "requires": {
-        "@rollup/pluginutils": "^3.0.0",
-        "resolve": "^1.12.2"
-      }
-    },
-    "@rollup/pluginutils": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.1.tgz",
-      "integrity": "sha512-PmNurkecagFimv7ZdKCVOfQuqKDPkrcpLFxRBcQ00LYr4HAjJwhCFxBiY2Xoletll2htTIiXBg6g0Yg21h2M3w==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1"
-      }
-    },
-    "@types/babel__core": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.3.tgz",
-      "integrity": "sha512-8fBo0UR2CcwWxeX7WIIgJ7lXjasFxoYgRnFHUj+hRvKkpiBJbxhdAPTCY6/ZKM0uxANFVzt4yObSLuTiTnazDA==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
-      }
-    },
-    "@types/babel__generator": {
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__template": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
-      "dev": true,
-      "requires": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
-      }
-    },
-    "@types/babel__traverse": {
-      "version": "7.0.8",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.8.tgz",
-      "integrity": "sha512-yGeB2dHEdvxjP0y4UbRtQaSkXJ9649fYCmIdRoul5kfAoGCwxuCbMhag0k3RPfnuh9kPGm8x89btcfDEXdVWGw==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.3.0"
-      }
-    },
-    "@types/color-name": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-      "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-      "dev": true
-    },
-    "@types/eslint-visitor-keys": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
-      "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
-      "dev": true
-    },
-    "@types/estree": {
-      "version": "0.0.40",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.40.tgz",
-      "integrity": "sha512-p3KZgMto/JyxosKGmnLDJ/dG5wf+qTRMUjHJcspC2oQKa4jP7mz+tv0ND56lLBu3ojHlhzY33Ol+khLyNmilkA==",
-      "dev": true
-    },
-    "@types/istanbul-lib-coverage": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz",
-      "integrity": "sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==",
-      "dev": true
-    },
-    "@types/istanbul-lib-report": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz",
-      "integrity": "sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==",
-      "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "*"
-      }
-    },
-    "@types/istanbul-reports": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz",
-      "integrity": "sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==",
-      "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "*",
-        "@types/istanbul-lib-report": "*"
-      }
-    },
-    "@types/jest": {
-      "version": "24.0.25",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.25.tgz",
-      "integrity": "sha512-hnP1WpjN4KbGEK4dLayul6lgtys6FPz0UfxMeMQCv0M+sTnzN3ConfiO72jHgLxl119guHgI8gLqDOrRLsyp2g==",
-      "dev": true,
-      "requires": {
-        "jest-diff": "^24.3.0"
-      }
-    },
-    "@types/json-schema": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.3.tgz",
-      "integrity": "sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==",
-      "dev": true
-    },
-    "@types/json5": {
-      "version": "0.0.29",
-      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
-      "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "13.13.9",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.9.tgz",
-      "integrity": "sha512-EPZBIGed5gNnfWCiwEIwTE2Jdg4813odnG8iNPMQGrqVxrI+wL68SPtPeCX+ZxGBaA6pKAVc6jaKgP/Q0QzfdQ==",
-      "dev": true
-    },
-    "@types/resolve": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
-      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "@types/stack-utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
-      "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==",
-      "dev": true
-    },
-    "@types/yargs": {
-      "version": "13.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.3.tgz",
-      "integrity": "sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ==",
-      "dev": true,
-      "requires": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "@types/yargs-parser": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-13.1.0.tgz",
-      "integrity": "sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg==",
-      "dev": true
-    },
-    "@typescript-eslint/eslint-plugin": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.12.0.tgz",
-      "integrity": "sha512-1t4r9rpLuEwl3hgt90jY18wJHSyb0E3orVL3DaqwmpiSDHmHiSspVsvsFF78BJ/3NNG3qmeso836jpuBWYziAA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "2.12.0",
-        "eslint-utils": "^1.4.3",
-        "functional-red-black-tree": "^1.0.1",
-        "regexpp": "^3.0.0",
-        "tsutils": "^3.17.1"
-      }
-    },
-    "@typescript-eslint/experimental-utils": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.12.0.tgz",
-      "integrity": "sha512-jv4gYpw5N5BrWF3ntROvCuLe1IjRenLy5+U57J24NbPGwZFAjhnM45qpq0nDH1y/AZMb3Br25YiNVwyPbz6RkA==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.12.0",
-        "eslint-scope": "^5.0.0"
-      }
-    },
-    "@typescript-eslint/parser": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.12.0.tgz",
-      "integrity": "sha512-lPdkwpdzxEfjI8TyTzZqPatkrswLSVu4bqUgnB03fHSOwpC7KSerPgJRgIAf11UGNf7HKjJV6oaPZI4AghLU6g==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "2.12.0",
-        "@typescript-eslint/typescript-estree": "2.12.0",
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "2.12.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.12.0.tgz",
-      "integrity": "sha512-rGehVfjHEn8Frh9UW02ZZIfJs6SIIxIu/K1bbci8rFfDE/1lQ8krIJy5OXOV3DVnNdDPtoiPOdEANkLMrwXbiQ==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "eslint-visitor-keys": "^1.1.0",
-        "glob": "^7.1.6",
-        "is-glob": "^4.0.1",
-        "lodash.unescape": "4.0.1",
-        "semver": "^6.3.0",
-        "tsutils": "^3.17.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "abab": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz",
-      "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==",
-      "dev": true
-    },
-    "acorn": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==",
-      "dev": true
-    },
-    "acorn-globals": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-      "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.0.1",
-        "acorn-walk": "^6.0.1"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "6.4.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-          "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-          "dev": true
-        }
-      }
-    },
-    "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
-      "dev": true
-    },
-    "acorn-walk": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz",
-      "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true
-    },
-    "ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
-      "dev": true
-    },
-    "array-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz",
-      "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=",
-      "dev": true
-    },
-    "array-includes": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-      "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0",
-        "is-string": "^1.0.5"
-      }
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "array.prototype.flat": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
-      "integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "at-least-node": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz",
-      "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A==",
-      "dev": true
-    },
-    "babel-jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz",
-      "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
-      "dev": true,
-      "requires": {
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/babel__core": "^7.1.0",
-        "babel-plugin-istanbul": "^5.1.0",
-        "babel-preset-jest": "^24.9.0",
-        "chalk": "^2.4.2",
-        "slash": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "babel-plugin-istanbul": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz",
-      "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "find-up": "^3.0.0",
-        "istanbul-lib-instrument": "^3.3.0",
-        "test-exclude": "^5.2.3"
-      }
-    },
-    "babel-plugin-jest-hoist": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz",
-      "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
-      "dev": true,
-      "requires": {
-        "@types/babel__traverse": "^7.0.6"
-      }
-    },
-    "babel-preset-jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
-      "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
-      "dev": true,
-      "requires": {
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "babel-plugin-jest-hoist": "^24.9.0"
-      }
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "bindings": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-      "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "browser-process-hrtime": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz",
-      "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==",
-      "dev": true
-    },
-    "browser-resolve": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz",
-      "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==",
-      "dev": true,
-      "requires": {
-        "resolve": "1.1.7"
-      },
-      "dependencies": {
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        }
-      }
-    },
-    "bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
-      "dev": true,
-      "requires": {
-        "fast-json-stable-stringify": "2.x"
-      }
-    },
-    "bser": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
-      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
-      "dev": true,
-      "requires": {
-        "node-int64": "^0.4.0"
-      }
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "builtin-modules": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
-      "dev": true
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
-    },
-    "capture-exit": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
-      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
-      "dev": true,
-      "requires": {
-        "rsvp": "^4.8.4"
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
-    "chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "dev": true,
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "cliui": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-      "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-      "dev": true,
-      "requires": {
-        "string-width": "^3.1.0",
-        "strip-ansi": "^5.2.0",
-        "wrap-ansi": "^5.1.0"
-      }
-    },
-    "co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "requires": {
-        "color-name": "1.1.3"
-      }
-    },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "command-line-args": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
-      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
-      "dev": true,
-      "requires": {
-        "array-back": "^3.0.1",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-      "dev": true,
-      "optional": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "contains-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-      "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      }
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-      "dev": true
-    },
-    "cssstyle": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-      "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
-      "dev": true,
-      "requires": {
-        "cssom": "0.3.x"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "data-urls": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz",
-      "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.0",
-        "whatwg-mimetype": "^2.2.0",
-        "whatwg-url": "^7.0.0"
-      },
-      "dependencies": {
-        "whatwg-url": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
-          "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
-          "dev": true,
-          "requires": {
-            "lodash.sortby": "^4.7.0",
-            "tr46": "^1.0.1",
-            "webidl-conversions": "^4.0.2"
-          }
-        }
-      }
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "detect-newline": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz",
-      "integrity": "sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=",
-      "dev": true
-    },
-    "diff-sequences": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz",
-      "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "domexception": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz",
-      "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
-      "dev": true,
-      "requires": {
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es-abstract": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.0.tgz",
-      "integrity": "sha512-yYkE07YF+6SIBmg1MsJ9dlub5L48Ek7X0qz+c/CPCHS9EBXfESorzng4cJQjJW5/pB6vDF41u7F8vUhLVDqIug==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.2.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.1",
-        "is-callable": "^1.1.5",
-        "is-regex": "^1.0.5",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-        "string.prototype.trimleft": "^2.1.1",
-        "string.prototype.trimright": "^2.1.1"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
-      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
-      }
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escodegen": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz",
-      "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==",
-      "dev": true,
-      "requires": {
-        "esprima": "^3.1.3",
-        "estraverse": "^4.2.0",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.6.1"
-      }
-    },
-    "eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "globals": {
-          "version": "12.3.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-12.3.0.tgz",
-          "integrity": "sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.8.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "regexpp": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-          "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "eslint-config-prettier": {
-      "version": "6.7.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.7.0.tgz",
-      "integrity": "sha512-FamQVKM3jjUVwhG4hEMnbtsq7xOIDm+SY5iBPfR8gKsJoAB2IQnNF+bk1+8Fy44Nq7PPJaLvkRxILYdJWoguKQ==",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^6.0.0"
-      }
-    },
-    "eslint-import-resolver-node": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
-      "integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.9",
-        "resolve": "^1.13.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "eslint-module-utils": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz",
-      "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.6.9",
-        "pkg-dir": "^2.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
-          "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.1.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-es": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz",
-      "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==",
-      "dev": true,
-      "requires": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        }
-      }
-    },
-    "eslint-plugin-import": {
-      "version": "2.21.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.21.2.tgz",
-      "integrity": "sha512-FEmxeGI6yaz+SnEB6YgNHlQK1Bs2DKLM+YF+vuTk5H8J9CLbJLtlPvRFgZZ2+sXiKAlN5dpdlrWOjK8ZoZJpQA==",
-      "dev": true,
-      "requires": {
-        "array-includes": "^3.1.1",
-        "array.prototype.flat": "^1.2.3",
-        "contains-path": "^0.1.0",
-        "debug": "^2.6.9",
-        "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.3",
-        "eslint-module-utils": "^2.6.0",
-        "has": "^1.0.3",
-        "minimatch": "^3.0.4",
-        "object.values": "^1.1.1",
-        "read-pkg-up": "^2.0.0",
-        "resolve": "^1.17.0",
-        "tsconfig-paths": "^3.9.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "doctrine": {
-          "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
-          "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-          "dev": true,
-          "requires": {
-            "esutils": "^2.0.2",
-            "isarray": "^1.0.0"
-          }
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "load-json-file": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
-          "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "parse-json": "^2.2.0",
-            "pify": "^2.0.0",
-            "strip-bom": "^3.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "parse-json": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-          "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-          "dev": true,
-          "requires": {
-            "error-ex": "^1.2.0"
-          }
-        },
-        "path-type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
-          "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-          "dev": true,
-          "requires": {
-            "pify": "^2.0.0"
-          }
-        },
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "read-pkg": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
-          "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-          "dev": true,
-          "requires": {
-            "load-json-file": "^2.0.0",
-            "normalize-package-data": "^2.3.2",
-            "path-type": "^2.0.0"
-          }
-        },
-        "read-pkg-up": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
-          "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-          "dev": true,
-          "requires": {
-            "find-up": "^2.0.0",
-            "read-pkg": "^2.0.0"
-          }
-        },
-        "resolve": {
-          "version": "1.17.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
-          "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
-          "dev": true,
-          "requires": {
-            "path-parse": "^1.0.6"
-          }
-        }
-      }
-    },
-    "eslint-plugin-node": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz",
-      "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==",
-      "dev": true,
-      "requires": {
-        "eslint-plugin-es": "^3.0.0",
-        "eslint-utils": "^2.0.0",
-        "ignore": "^5.1.1",
-        "minimatch": "^3.0.4",
-        "resolve": "^1.10.1",
-        "semver": "^6.1.0"
-      },
-      "dependencies": {
-        "eslint-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
-          "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
-          "dev": true,
-          "requires": {
-            "eslint-visitor-keys": "^1.1.0"
-          }
-        },
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "eslint-plugin-prettier": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz",
-      "integrity": "sha512-GlolCC9y3XZfv3RQfwGew7NnuFDKsfI4lbvRK+PIIo23SFH+LemGs4cKwzAaRa+Mdb+lQO/STaIayno8T5sJJA==",
-      "dev": true,
-      "requires": {
-        "prettier-linter-helpers": "^1.0.0"
-      }
-    },
-    "eslint-scope": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-      "dev": true
-    },
-    "espree": {
-      "version": "6.1.2",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz",
-      "integrity": "sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==",
-      "dev": true,
-      "requires": {
-        "acorn": "^7.1.0",
-        "acorn-jsx": "^5.1.0",
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "esprima": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
-      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "estree-walker": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "exec-sh": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-      "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
-      "dev": true
-    },
-    "execa": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.2.tgz",
-      "integrity": "sha512-QI2zLa6CjGWdiQsmSkZoGtDx2N+cQIGb3yNolGTdjSQzydzLgYYf8LRuagp7S7fPimjcrzUDSUFd/MgzELMi4Q==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.0",
-        "get-stream": "^5.0.0",
-        "human-signals": "^1.1.1",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.0",
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2",
-        "strip-final-newline": "^2.0.0"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
-    "exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
-      "dev": true
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "expect": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
-      "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "ansi-styles": "^3.2.0",
-        "jest-get-type": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-regex-util": "^24.9.0"
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
-    "fast-diff": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz",
-      "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "fb-watchman": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
-      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
-      "dev": true,
-      "requires": {
-        "bser": "2.1.1"
-      }
-    },
-    "figures": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.1.0.tgz",
-      "integrity": "sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
-    "file-uri-to-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-      "dev": true,
-      "optional": true
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "dev": true,
-      "requires": {
-        "array-back": "^3.0.1"
-      }
-    },
-    "find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^3.0.0"
-      }
-    },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
-      "dev": true
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fs-extra": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
-      "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
-      "dev": true,
-      "requires": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "bindings": "^1.5.0",
-        "nan": "^2.12.1",
-        "node-pre-gyp": "*"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "3.2.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.6.0"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.9.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.3.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.9.0"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^3.2.6",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.14.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4.4.2"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "npm-normalize-package-bin": "^1.0.1"
-          }
-        },
-        "npm-normalize-package-bin": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.7",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.13",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.8.6",
-            "minizlib": "^1.2.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.3"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
-      "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-      "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-      "dev": true,
-      "requires": {
-        "pump": "^3.0.0"
-      }
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-      "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
-      "dev": true,
-      "requires": {
-        "is-glob": "^4.0.1"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
-    },
-    "growly": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
-      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-      "dev": true
-    },
-    "gzip-size": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
-      "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^4.0.1"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
-      }
-    },
-    "handlebars": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
-      "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
-      "dev": true,
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-      "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
-      "dev": true
-    },
-    "html-encoding-sniffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz",
-      "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
-      "dev": true,
-      "requires": {
-        "whatwg-encoding": "^1.0.1"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "human-signals": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-      "dev": true
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-      "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
-        }
-      }
-    },
-    "import-local": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
-      "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
-      "dev": true,
-      "requires": {
-        "pkg-dir": "^3.0.0",
-        "resolve-cwd": "^2.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "inquirer": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.1.tgz",
-      "integrity": "sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-escapes": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.0.tgz",
-          "integrity": "sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==",
-          "dev": true,
-          "requires": {
-            "type-fest": "^0.8.1"
-          }
-        },
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "emoji-regex": {
-          "version": "8.0.0",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "6.0.0",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-              "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^5.0.0"
-              }
-            }
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-callable": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-      "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-      "dev": true
-    },
-    "is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^2.0.0"
-      }
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
-    "is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-      "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-      "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-      "dev": true
-    },
-    "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true
-    },
-    "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
-      "dev": true,
-      "requires": {
-        "has-symbols": "^1.0.1"
-      }
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "istanbul-lib-coverage": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz",
-      "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==",
-      "dev": true
-    },
-    "istanbul-lib-instrument": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz",
-      "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
-      "dev": true,
-      "requires": {
-        "@babel/generator": "^7.4.0",
-        "@babel/parser": "^7.4.3",
-        "@babel/template": "^7.4.0",
-        "@babel/traverse": "^7.4.3",
-        "@babel/types": "^7.4.0",
-        "istanbul-lib-coverage": "^2.0.5",
-        "semver": "^6.0.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
-    "istanbul-lib-report": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz",
-      "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-source-maps": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz",
-      "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
-      "dev": true,
-      "requires": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^2.0.5",
-        "make-dir": "^2.1.0",
-        "rimraf": "^2.6.3",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.7.1",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
-      }
-    },
-    "istanbul-reports": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz",
-      "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==",
-      "dev": true,
-      "requires": {
-        "handlebars": "^4.1.2"
-      }
-    },
-    "jest": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz",
-      "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==",
-      "dev": true,
-      "requires": {
-        "import-local": "^2.0.0",
-        "jest-cli": "^24.9.0"
-      },
-      "dependencies": {
-        "jest-cli": {
-          "version": "24.9.0",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz",
-          "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
-          "dev": true,
-          "requires": {
-            "@jest/core": "^24.9.0",
-            "@jest/test-result": "^24.9.0",
-            "@jest/types": "^24.9.0",
-            "chalk": "^2.0.1",
-            "exit": "^0.1.2",
-            "import-local": "^2.0.0",
-            "is-ci": "^2.0.0",
-            "jest-config": "^24.9.0",
-            "jest-util": "^24.9.0",
-            "jest-validate": "^24.9.0",
-            "prompts": "^2.0.1",
-            "realpath-native": "^1.1.0",
-            "yargs": "^13.3.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              }
-            }
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-changed-files": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz",
-      "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "execa": "^1.0.0",
-        "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "dev": true,
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        }
-      }
-    },
-    "jest-config": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz",
-      "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
-      "dev": true,
-      "requires": {
-        "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "babel-jest": "^24.9.0",
-        "chalk": "^2.0.1",
-        "glob": "^7.1.1",
-        "jest-environment-jsdom": "^24.9.0",
-        "jest-environment-node": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "pretty-format": "^24.9.0",
-        "realpath-native": "^1.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-diff": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz",
-      "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1",
-        "diff-sequences": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-docblock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz",
-      "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
-      "dev": true,
-      "requires": {
-        "detect-newline": "^2.1.0"
-      }
-    },
-    "jest-each": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz",
-      "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "jest-get-type": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-environment-jsdom": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz",
-      "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jsdom": "^11.5.1"
-      }
-    },
-    "jest-environment-node": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz",
-      "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
-      "dev": true,
-      "requires": {
-        "@jest/environment": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-util": "^24.9.0"
-      }
-    },
-    "jest-get-type": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz",
-      "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==",
-      "dev": true
-    },
-    "jest-haste-map": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz",
-      "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "anymatch": "^2.0.0",
-        "fb-watchman": "^2.0.0",
-        "fsevents": "^1.2.7",
-        "graceful-fs": "^4.1.15",
-        "invariant": "^2.2.4",
-        "jest-serializer": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.9.0",
-        "micromatch": "^3.1.10",
-        "sane": "^4.0.3",
-        "walker": "^1.0.7"
-      }
-    },
-    "jest-jasmine2": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz",
-      "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
-      "dev": true,
-      "requires": {
-        "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "co": "^4.6.0",
-        "expect": "^24.9.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "pretty-format": "^24.9.0",
-        "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-leak-detector": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz",
-      "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
-      "dev": true,
-      "requires": {
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      }
-    },
-    "jest-matcher-utils": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz",
-      "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.1",
-        "jest-diff": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-message-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz",
-      "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/stack-utils": "^1.0.1",
-        "chalk": "^2.0.1",
-        "micromatch": "^3.1.10",
-        "slash": "^2.0.0",
-        "stack-utils": "^1.0.1"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-mock": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz",
-      "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0"
-      }
-    },
-    "jest-pnp-resolver": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-      "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
-      "dev": true
-    },
-    "jest-regex-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz",
-      "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==",
-      "dev": true
-    },
-    "jest-resolve": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz",
-      "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "browser-resolve": "^1.11.3",
-        "chalk": "^2.0.1",
-        "jest-pnp-resolver": "^1.2.1",
-        "realpath-native": "^1.1.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-resolve-dependencies": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz",
-      "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-snapshot": "^24.9.0"
-      }
-    },
-    "jest-runner": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz",
-      "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.4.2",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-docblock": "^24.3.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-jasmine2": "^24.9.0",
-        "jest-leak-detector": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "jest-runtime": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-worker": "^24.6.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^4.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-runtime": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz",
-      "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.7.1",
-        "@jest/environment": "^24.9.0",
-        "@jest/source-map": "^24.3.0",
-        "@jest/transform": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "chalk": "^2.0.1",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.1.15",
-        "jest-config": "^24.9.0",
-        "jest-haste-map": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-mock": "^24.9.0",
-        "jest-regex-util": "^24.3.0",
-        "jest-resolve": "^24.9.0",
-        "jest-snapshot": "^24.9.0",
-        "jest-util": "^24.9.0",
-        "jest-validate": "^24.9.0",
-        "realpath-native": "^1.1.0",
-        "slash": "^2.0.0",
-        "strip-bom": "^3.0.0",
-        "yargs": "^13.3.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-serializer": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz",
-      "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==",
-      "dev": true
-    },
-    "jest-snapshot": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz",
-      "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.0.0",
-        "@jest/types": "^24.9.0",
-        "chalk": "^2.0.1",
-        "expect": "^24.9.0",
-        "jest-diff": "^24.9.0",
-        "jest-get-type": "^24.9.0",
-        "jest-matcher-utils": "^24.9.0",
-        "jest-message-util": "^24.9.0",
-        "jest-resolve": "^24.9.0",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^24.9.0",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-util": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz",
-      "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^24.9.0",
-        "@jest/fake-timers": "^24.9.0",
-        "@jest/source-map": "^24.9.0",
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "callsites": "^3.0.0",
-        "chalk": "^2.0.1",
-        "graceful-fs": "^4.1.15",
-        "is-ci": "^2.0.0",
-        "mkdirp": "^0.5.1",
-        "slash": "^2.0.0",
-        "source-map": "^0.6.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-validate": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz",
-      "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "camelcase": "^5.3.1",
-        "chalk": "^2.0.1",
-        "jest-get-type": "^24.9.0",
-        "leven": "^3.1.0",
-        "pretty-format": "^24.9.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-watcher": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz",
-      "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
-      "dev": true,
-      "requires": {
-        "@jest/test-result": "^24.9.0",
-        "@jest/types": "^24.9.0",
-        "@types/yargs": "^13.0.0",
-        "ansi-escapes": "^3.0.0",
-        "chalk": "^2.0.1",
-        "jest-util": "^24.9.0",
-        "string-length": "^2.0.0"
-      },
-      "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          }
-        },
-        "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "jest-worker": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
-      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
-      "dev": true,
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-          "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-          "dev": true
-        }
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "jsdom": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-      "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
-      "dev": true,
-      "requires": {
-        "abab": "^2.0.0",
-        "acorn": "^5.5.3",
-        "acorn-globals": "^4.1.0",
-        "array-equal": "^1.0.0",
-        "cssom": ">= 0.3.2 < 0.4.0",
-        "cssstyle": "^1.0.0",
-        "data-urls": "^1.0.0",
-        "domexception": "^1.0.1",
-        "escodegen": "^1.9.1",
-        "html-encoding-sniffer": "^1.0.2",
-        "left-pad": "^1.3.0",
-        "nwsapi": "^2.0.7",
-        "parse5": "4.0.0",
-        "pn": "^1.1.0",
-        "request": "^2.87.0",
-        "request-promise-native": "^1.0.5",
-        "sax": "^1.2.4",
-        "symbol-tree": "^3.2.2",
-        "tough-cookie": "^2.3.4",
-        "w3c-hr-time": "^1.0.1",
-        "webidl-conversions": "^4.0.2",
-        "whatwg-encoding": "^1.0.3",
-        "whatwg-mimetype": "^2.1.0",
-        "whatwg-url": "^6.4.1",
-        "ws": "^5.2.0",
-        "xml-name-validator": "^3.0.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "5.7.4",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-          "dev": true
-        }
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
-      "dev": true,
-      "requires": {
-        "minimist": "^1.2.0"
-      }
-    },
-    "jsonfile": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
-      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^1.0.0"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-      "dev": true
-    },
-    "kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "dev": true
-    },
-    "left-pad": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz",
-      "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==",
-      "dev": true
-    },
-    "leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "dev": true
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "load-json-file": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0",
-        "strip-bom": "^3.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
-    },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=",
-      "dev": true
-    },
-    "lodash.sortby": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
-    },
-    "lodash.unescape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
-      "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=",
-      "dev": true
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "dev": true,
-      "requires": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        }
-      }
-    },
-    "make-error": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz",
-      "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==",
-      "dev": true
-    },
-    "makeerror": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
-      "dev": true,
-      "requires": {
-        "tmpl": "1.0.x"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "mime-db": {
-      "version": "1.42.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
-      "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.25",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
-      "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.42.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true,
-      "optional": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
-      "dev": true
-    },
-    "node-modules-regexp": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
-      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
-      "dev": true
-    },
-    "node-notifier": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-      "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
-      "dev": true,
-      "requires": {
-        "growly": "^1.3.0",
-        "is-wsl": "^1.1.0",
-        "semver": "^5.5.0",
-        "shellwords": "^0.1.1",
-        "which": "^1.3.0"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dev": true,
-      "requires": {
-        "path-key": "^3.0.0"
-      },
-      "dependencies": {
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        }
-      }
-    },
-    "nwsapi": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
-      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-inspect": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-      "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-      "dev": true
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-      "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.values": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
-      "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.0-next.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
-      "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
-        }
-      }
-    },
-    "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-each-series": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz",
-      "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
-      "dev": true,
-      "requires": {
-        "p-reduce": "^1.0.0"
-      }
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-reduce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz",
-      "integrity": "sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=",
-      "dev": true
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      }
-    },
-    "parse5": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-      "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-      "dev": true
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-type": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true
-    },
-    "pirates": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
-      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
-      "dev": true,
-      "requires": {
-        "node-modules-regexp": "^1.0.0"
-      }
-    },
-    "pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0"
-      }
-    },
-    "pn": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
-      "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==",
-      "dev": true
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "prettier": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
-      "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
-      "dev": true
-    },
-    "prettier-linter-helpers": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
-      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
-      "dev": true,
-      "requires": {
-        "fast-diff": "^1.1.2"
-      }
-    },
-    "pretty-bytes": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz",
-      "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==",
-      "dev": true
-    },
-    "pretty-format": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz",
-      "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
-      "dev": true,
-      "requires": {
-        "@jest/types": "^24.9.0",
-        "ansi-regex": "^4.0.0",
-        "ansi-styles": "^3.2.0",
-        "react-is": "^16.8.4"
-      }
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "prompts": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz",
-      "integrity": "sha512-NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg==",
-      "dev": true,
-      "requires": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.3"
-      }
-    },
-    "psl": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.6.0.tgz",
-      "integrity": "sha512-SYKKmVel98NCOYXpkwUqZqh0ahZeeKfmisiLIcEZdsb+WbLv02g/dI5BUmZnIyOe7RzZtLax81nnb2HbvC2tzA==",
-      "dev": true
-    },
-    "pump": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
-    "react-is": {
-      "version": "16.12.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
-      "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==",
-      "dev": true
-    },
-    "read-pkg": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^4.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^3.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
-      "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
-      "dev": true,
-      "requires": {
-        "find-up": "^3.0.0",
-        "read-pkg": "^3.0.0"
-      }
-    },
-    "realpath-native": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
-      "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
-      "dev": true,
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexpp": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz",
-      "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==",
-      "dev": true
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        },
-        "tough-cookie": {
-          "version": "2.4.3",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-          "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.24",
-            "punycode": "^1.4.1"
-          }
-        }
-      }
-    },
-    "request-promise-core": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz",
-      "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.15"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz",
-      "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==",
-      "dev": true,
-      "requires": {
-        "request-promise-core": "1.1.3",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.1.tgz",
-      "integrity": "sha512-fn5Wobh4cxbLzuHaE+nphztHy43/b++4M6SsGFC2gB8uYwf0C8LcarfCz1un7UTW8OFQg9iNjZ4xpcFVGebDPg==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-cwd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
-      "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-      "dev": true
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dev": true,
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rollup": {
-      "version": "1.27.14",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.27.14.tgz",
-      "integrity": "sha512-DuDjEyn8Y79ALYXMt+nH/EI58L5pEw5HU9K38xXdRnxQhvzUTI/nxAawhkAHUQeudANQ//8iyrhVRHJBuR6DSQ==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/node": "*",
-        "acorn": "^7.1.0"
-      }
-    },
-    "rollup-plugin-node-resolve": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
-      "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
-      "dev": true,
-      "requires": {
-        "@types/resolve": "0.0.8",
-        "builtin-modules": "^3.1.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.11.1",
-        "rollup-pluginutils": "^2.8.1"
-      }
-    },
-    "rollup-plugin-sourcemaps": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.4.2.tgz",
-      "integrity": "sha1-YhJaqUCHqt97g+9N+vYptHMTXoc=",
-      "dev": true,
-      "requires": {
-        "rollup-pluginutils": "^2.0.1",
-        "source-map-resolve": "^0.5.0"
-      }
-    },
-    "rollup-pluginutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
-      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1"
-      }
-    },
-    "rsvp": {
-      "version": "4.8.5",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
-      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
-      "dev": true
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "sane": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
-      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
-      "dev": true,
-      "requires": {
-        "@cnakazawa/watch": "^1.0.3",
-        "anymatch": "^2.0.0",
-        "capture-exit": "^2.0.0",
-        "exec-sh": "^0.3.2",
-        "execa": "^1.0.0",
-        "fb-watchman": "^2.0.0",
-        "micromatch": "^3.1.4",
-        "minimist": "^1.1.1",
-        "walker": "~1.0.5"
-      },
-      "dependencies": {
-        "execa": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-          "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-          "dev": true,
-          "requires": {
-            "cross-spawn": "^6.0.0",
-            "get-stream": "^4.0.0",
-            "is-stream": "^1.1.0",
-            "npm-run-path": "^2.0.0",
-            "p-finally": "^1.0.0",
-            "signal-exit": "^3.0.0",
-            "strip-eof": "^1.0.0"
-          }
-        },
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "is-stream": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-          "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-          "dev": true
-        },
-        "npm-run-path": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-          "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-          "dev": true,
-          "requires": {
-            "path-key": "^2.0.0"
-          }
-        }
-      }
-    },
-    "sax": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-      "dev": true
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "sisteransi": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz",
-      "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==",
-      "dev": true
-    },
-    "slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      }
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stack-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-      "integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-      "dev": true
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
-    "string-length": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz",
-      "integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
-      "dev": true,
-      "requires": {
-        "astral-regex": "^1.0.0",
-        "strip-ansi": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          }
-        }
-      }
-    },
-    "string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "requires": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      }
-    },
-    "string.prototype.trimleft": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-      "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "string.prototype.trimright": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-      "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "function-bind": "^1.1.1"
-      }
-    },
-    "strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^4.1.0"
-      }
-    },
-    "strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "strip-final-newline": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-      "dev": true
-    },
-    "strip-json-comments": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-      "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        }
-      }
-    },
-    "symbol-tree": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
-      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
-      "dev": true
-    },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      }
-    },
-    "test-exclude": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz",
-      "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3",
-        "minimatch": "^3.0.4",
-        "read-pkg-up": "^4.0.0",
-        "require-main-filename": "^2.0.0"
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "throat": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz",
-      "integrity": "sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "tmpl": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
-      }
-    },
-    "tr46": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-      "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "ts-jest": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.2.0.tgz",
-      "integrity": "sha512-Yc+HLyldlIC9iIK8xEN7tV960Or56N49MDP7hubCZUeI7EbIOTsas6rXCMB4kQjLACJ7eDOF4xWEO5qumpKsag==",
-      "dev": true,
-      "requires": {
-        "bs-logger": "0.x",
-        "buffer-from": "1.x",
-        "fast-json-stable-stringify": "2.x",
-        "json5": "2.x",
-        "lodash.memoize": "4.x",
-        "make-error": "1.x",
-        "mkdirp": "0.x",
-        "resolve": "1.x",
-        "semver": "^5.5",
-        "yargs-parser": "10.x"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "10.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
-          "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-          }
-        }
-      }
-    },
-    "tsconfig-paths": {
-      "version": "3.9.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz",
-      "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==",
-      "dev": true,
-      "requires": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.1",
-        "minimist": "^1.2.0",
-        "strip-bom": "^3.0.0"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        }
-      }
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-      "dev": true
-    },
-    "tsutils": {
-      "version": "3.17.1",
-      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-      "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.8.1"
-      }
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
-    },
-    "typescript": {
-      "version": "3.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.2.tgz",
-      "integrity": "sha512-q2ktq4n/uLuNNShyayit+DTobV2ApPEo/6so68JaD5ojvc/6GClBipedB9zNWYxRSAlZXAe405Rlijzl6qDiSw==",
-      "dev": true
-    },
-    "typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.7.2.tgz",
-      "integrity": "sha512-uhRwZcANNWVLrxLfNFEdltoPNhECUR3lc+UdJoG9CBpMcSnKyWA94tc3eAujB1GcMY5Uwq8ZMp4qWpxWYDQmaA==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.3",
-        "source-map": "~0.6.1"
-      }
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
-      "dev": true
-    },
-    "v8-compile-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==",
-      "dev": true
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "w3c-hr-time": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz",
-      "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
-      "dev": true,
-      "requires": {
-        "browser-process-hrtime": "^0.1.2"
-      }
-    },
-    "walker": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
-      "dev": true,
-      "requires": {
-        "makeerror": "1.0.x"
-      }
-    },
-    "webidl-conversions": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
-      "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
-      "dev": true
-    },
-    "whatwg-encoding": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
-      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
-      "dev": true,
-      "requires": {
-        "iconv-lite": "0.4.24"
-      }
-    },
-    "whatwg-mimetype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
-      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
-      "dev": true
-    },
-    "whatwg-url": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-      "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-      "dev": true,
-      "requires": {
-        "lodash.sortby": "^4.7.0",
-        "tr46": "^1.0.1",
-        "webidl-conversions": "^4.0.2"
-      }
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-      "dev": true
-    },
-    "word-wrap": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-      "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "string-width": "^3.0.0",
-        "strip-ansi": "^5.0.0"
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "write-file-atomic": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz",
-      "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ws": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-      "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0"
-      }
-    },
-    "xml-name-validator": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-      "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "13.3.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-      "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
-      "dev": true,
-      "requires": {
-        "cliui": "^5.0.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^3.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^13.1.1"
-      }
-    },
-    "yargs-parser": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      }
-    }
-  }
-}
diff --git a/package.json b/package.json
index 4b81bdf..57bc85a 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,5 @@
     "rollup-plugin-sourcemaps": "^0.4.2",
     "ts-jest": "^24.2.0",
     "typescript": "^3.8.0"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/src/-private/change.ts b/src/-private/change.ts
index 3c112a0..550576b 100644
--- a/src/-private/change.ts
+++ b/src/-private/change.ts
@@ -1,5 +1,5 @@
 /* import { IChange } from '../types'; */
-import isObject from '../utils/is-object';
+import isObject from './utils/is-object';
 
 export const VALUE = Symbol('__value__');
 
diff --git a/src/-private/changesets/changeset.ts b/src/-private/changesets/changeset.ts
new file mode 100644
index 0000000..7a6330c
--- /dev/null
+++ b/src/-private/changesets/changeset.ts
@@ -0,0 +1,150 @@
+import {
+  ChangeRecord,
+  Config,
+  IChangeset,
+  IErr,
+  PrepareChangesFn,
+  PublicErrors,
+  Snapshot,
+  TContent,
+  ValidationErr,
+  ValidatorAction,
+  ValidatorMap
+} from '../../types';
+import handlerFor from '../utils/handler-for';
+import IChangesetProxyHandler from './proxy/changeset-proxy-handler-interface';
+import ProxyOptions from './proxy/proxy-options';
+
+export default class Changeset<T extends TContent> implements IChangeset<T> {
+  constructor(
+    data: T,
+    validateFn?: ValidatorAction,
+    validationMap?: ValidatorMap | null | undefined,
+    options?: Config
+  ) {
+    this._options = {
+      changesetKeys: options?.changesetKeys,
+      skipValidate: options?.skipValidate,
+      getArrayStorage: undefined,
+      getMap: undefined,
+      validateFn,
+      validationMap
+    };
+    this._proxyHandler = handlerFor(data, this._options);
+    this._proxy = new Proxy(data, this._proxyHandler);
+  }
+
+  private readonly _options: ProxyOptions;
+  private readonly _proxy: T;
+  private readonly _proxyHandler: IChangesetProxyHandler<T>;
+
+  get content(): T {
+    return this._proxy;
+  }
+
+  get originalContent(): T {
+    return this._proxyHandler.originalContent;
+  }
+
+  get changes(): ChangeRecord[] {
+    return this._proxyHandler.changes;
+  }
+
+  get errors(): PublicErrors {
+    return this._proxyHandler.errors;
+  }
+
+  get error(): Record<string, any> {
+    return this._proxyHandler.errors;
+  }
+
+  get change(): Record<string, any> {
+    return this._proxyHandler.errors;
+  }
+
+  get isDirty(): boolean {
+    return this._proxyHandler.isDirty;
+  }
+
+  get isPristine(): boolean {
+    return this._proxyHandler.isPristine;
+  }
+
+  get isValid(): boolean {
+    return this._proxyHandler.isValid;
+  }
+
+  get isInvalid(): boolean {
+    return this._proxyHandler.isInvalid;
+  }
+
+  prepare(preparedChangedFn: PrepareChangesFn): this {
+    this._proxyHandler.prepare(preparedChangedFn);
+    return this;
+  }
+
+  execute(): this {
+    this._proxyHandler.execute();
+    return this;
+  }
+
+  unexecute(): this {
+    this._proxyHandler.unexecute();
+    return this;
+  }
+
+  merge(changeset2: IChangeset<T>): IChangeset<T> {
+    let newContent = (Array.isArray(this.content) ? [] : {}) as T;
+    // create a new changeset with our options
+    let result = new Changeset(newContent, this._options.validateFn, this._options.validationMap, {
+      changesetKeys: this._options.changesetKeys,
+      skipValidate: this._options.skipValidate
+    });
+    // apply our changes
+    this.applyTo(result.content);
+    // apply the other changes over the top
+    changeset2.applyTo(result.content);
+    return result;
+  }
+
+  rollback(): this {
+    this._proxyHandler.rollback();
+    return this;
+  }
+
+  rollbackInvalid(key: string | void): this {
+    this._proxyHandler.rollbackInvalid(key);
+    return this;
+  }
+
+  rollbackProperty(key: string): this {
+    this._proxyHandler.rollbackProperty(key);
+    return this;
+  }
+
+  applyTo(target: T): this {
+    this._proxyHandler.applyTo(target);
+    return this;
+  }
+
+  validate(...keys: string[]): Promise<any> {
+    return this._proxyHandler.validate(...keys);
+  }
+
+  pushErrors<T>(key: string, ...newErrors: (ValidationErr | IErr<T>)[]): IErr<any> {
+    return this._proxyHandler.pushErrors(key, ...newErrors);
+  }
+
+  snapshot(): Snapshot {
+    return this._proxyHandler.snapshot();
+  }
+
+  restore(obj: Snapshot): this {
+    this._proxyHandler.restore(obj);
+    return this;
+  }
+
+  isValidating(key: string | void): boolean {
+    return this._proxyHandler.isValidating(key);
+  }
+}
diff --git a/src/-private/changesets/proxy/changeset-array-proxy-handler.ts b/src/-private/changesets/proxy/changeset-array-proxy-handler.ts
new file mode 100644
index 0000000..cd27ea5
--- /dev/null
+++ b/src/-private/changesets/proxy/changeset-array-proxy-handler.ts
@@ -0,0 +1,548 @@
+import { Err, Notifier } from '../..';
+import { isObject } from '../../..';
+import {
+  Changes,
+  Errors,
+  IChangeset,
+  IErr,
+  PrepareChangesFn,
+  PublicErrors,
+  RunningValidations,
+  Snapshot,
+  TContentArray,
+  ValidationErr
+} from '../../../types';
+import getDeep from '../../utils/get-deep';
+import handlerFor from '../../utils/handler-for';
+import { ChangesetIdentityKey, isChangeset } from '../../utils/is-changeset';
+import isUnchanged from '../../utils/is-unchanged';
+import replaceArrayContent from '../../utils/replace-array-content';
+import requiresProxying from '../../utils/requires-proxying';
+import setDeep from '../../utils/set-deep';
+import splitKey from '../../utils/split-key';
+import { AFTER_ROLLBACK_EVENT } from '../../utils/strings';
+import IChangesetProxyHandler, { Change } from './changeset-proxy-handler-interface';
+import ProxyOptions from './proxy-options';
+import { DeleteOnUndo } from './proxy-symbols';
+
+type Input = any[];
+
+const NoValidation = false;
+
+interface EventedCallback {
+  (args: any[]): void;
+}
+
+export default class ChangesetArrayProxyHandler<T extends TContentArray>
+  implements IChangesetProxyHandler<T> {
+  constructor(source: T, options: ProxyOptions) {
+    this.options = options;
+    this.__originalContent = source;
+  }
+
+  get originalContent(): T {
+    return this.__originalContent as T;
+  }
+
+  applyTo(target?: T): this {
+    this.execute(target);
+    this.clearPending();
+    return this;
+  }
+
+  pushErrors<T>(key: string, ...newErrors: (ValidationErr | IErr<T>)[]): IErr<any> {
+    let errors: Errors<any> = this.__errors;
+    let existingError: IErr<any> = getDeep(errors, key) || new Err(null);
+    let validation: ValidationErr[] = existingError.validation;
+    let value: any = this.getValue(key);
+
+    this.__errors = setDeep(errors, key as string, newErrors);
+    this.__errorsCache = this.__errors;
+
+    return { value, validation };
+  }
+
+  restore({ changes, errors }: Snapshot): this {
+    this.clearPending();
+    if (changes) {
+      for (let key of Object.keys(changes)) {
+        let value = changes[key];
+        this.setValue(key, value, false);
+      }
+    }
+    if (errors) {
+      let newErrors: Errors<any> = Object.keys(errors).reduce(
+        (newObj: Errors<any>, key: keyof Changes) => {
+          let e: IErr<any> = errors[key];
+          newObj[key] = new Err(e.value, ...e.validation);
+          return newObj;
+        },
+        {}
+      );
+
+      // @tracked
+      this.__errors = newErrors;
+      this.__errorsCache = this.__errors;
+    }
+    return this;
+  }
+
+  snapshot(): Snapshot {
+    let changes: Changes = this.change;
+    let errors: Errors<any> = this.__errors;
+
+    return {
+      changes: Object.keys(changes).reduce((newObj: Changes, key: keyof Changes) => {
+        let change = changes[key];
+        if (isObject(change)) {
+          // clone it
+          change = Object.assign({}, change);
+        }
+        newObj[key] = change;
+        return newObj;
+      }, {}),
+
+      errors: Object.keys(errors).reduce((newObj: Errors<any>, key: keyof Errors<any>) => {
+        let e = errors[key];
+        newObj[key] = { value: e.value, validation: e.validation };
+        return newObj;
+      }, {})
+    };
+  }
+
+  public get(_target: T, key: string | symbol, receiver: any): any {
+    // extra stuff
+    console.log('get ' + key.toString());
+    switch (key) {
+      case 'copyWithin':
+      case 'fill':
+      case 'pop':
+      case 'push':
+      case 'reverse':
+      case 'shift':
+      case 'sort':
+      case 'splice':
+      case 'unshift':
+        return Reflect.get(this.writeArray, key, receiver);
+    }
+    key = key.toString();
+    if (typeof (this.readArray as Record<string, any>)[key] === 'function') {
+      return (this.readArray as Record<string, any>)[key];
+    }
+    switch (key) {
+      case 'length':
+        return Reflect.get(this.writeArray, key, receiver);
+    }
+    return this.getValue(key);
+  }
+
+  public has(target: Record<string, any>, key: string) {
+    return Reflect.has(this.readArray, key);
+  }
+
+  public ownKeys() {
+    return Reflect.ownKeys(this.readArray);
+  }
+
+  public getOwnPropertyDescriptor(
+    target: Record<string, any>,
+    key: string
+  ): PropertyDescriptor | undefined {
+    return Reflect.getOwnPropertyDescriptor(this.readArray, key);
+  }
+
+  public set(_target: {}, key: string, value: any): any {
+    return this.setValue(key, value);
+  }
+
+  public readonly isChangeset = true;
+
+  public get isDirty(): boolean {
+    // we're dirty if either we have top level changes
+    // or if a nested proxy is dirty
+    let changes = this.__changes;
+    if (!changes) {
+      return false;
+    }
+    let data = this.__originalContent;
+    if (changes.length !== data.length) {
+      return true;
+    }
+    for (let i = 0; i < data.length; i++) {
+      let change = changes[i];
+      if (!isUnchanged(change, data[i])) {
+        // a proxy is always different from the original
+        // see if it's dirty
+        if (isChangeset(change)) {
+          if (change.isDirty) {
+            return true;
+          } else if (change.data !== data[i]) {
+            // it's a proxy for a new object
+            return true;
+          }
+        } else {
+          // scalar values that has changed
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  public get isPristine(): boolean {
+    return !this.isDirty;
+  }
+
+  public get isInvalid(): boolean {
+    return !this.isValid;
+  }
+
+  public get isValid(): boolean {
+    // validate this level
+    if (Object.keys(this.__errors).length > 0) {
+      return false;
+    }
+    // now look at all the nested proxies
+    if (this.__changes === undefined) {
+      return true;
+    }
+    for (let change of this.__changes) {
+      if (isChangeset(change) && !change.isValid) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  public get content(): T {
+    return this.readArray;
+  }
+
+  public get error(): object {
+    return this.__errors;
+  }
+
+  public get errors(): PublicErrors {
+    return Object.keys(this.__errors).map(key => {
+      let entry = this.__errors[key];
+      return {
+        key,
+        value: entry.value,
+        validation: entry.validation
+      };
+    });
+  }
+
+  public isValidating(key: string | void): boolean {
+    let runningValidations: RunningValidations = this._runningValidations;
+    let ks: string[] = Object.keys(runningValidations);
+    if (key) {
+      return ks.includes(key);
+    }
+    return ks.length > 0;
+  }
+
+  rollbackInvalid(key: string | void): this {
+    if (!key) {
+      // clone the array so we can edit the object
+      // while iterating the keys
+      let keys = [...Object.keys(this.__errors)];
+      for (let key of keys) {
+        this.rollbackProperty(key);
+      }
+    } else if (this.__errors[key]) {
+      this.rollbackProperty(key);
+    }
+    return this;
+  }
+
+  public at(index: number) {
+    // is it an existing proxy?
+    return this.readArray[index];
+  }
+
+  cast() {
+    // noop
+  }
+
+  /**
+   * String representation for the changeset.
+   */
+  get [Symbol.toStringTag](): string {
+    return this.readArray.toString();
+  }
+
+  public getValue(key: string) {
+    if (key === ChangesetIdentityKey) {
+      return true;
+    }
+    let [localKey, subkey] = splitKey(key);
+    // it wasn't in there so look in our array
+    let index = parseInt(localKey);
+    if (index === NaN) {
+      return undefined;
+    }
+    if (index < 0) {
+      throw 'Negative indices are not allowed as arrays do not serialize values at negative indices';
+    }
+    let value = this.readArray[index];
+    if (requiresProxying(value)) {
+      value = this.addProxy(index, this.writeArray[index]);
+    }
+    if (subkey) {
+      value = value[subkey];
+    }
+    return value;
+  }
+
+  private get readArray(): T {
+    return (this.__changes ?? this.__originalContent) as T;
+  }
+
+  private get writeArray(): T {
+    if (this.__changes === undefined) {
+      this.__changes = [...this.__originalContent];
+    }
+    return this.__changes as T;
+  }
+
+  public setValue(key: string, value: any, _validate = true): boolean {
+    let [localKey, subkey] = splitKey(key);
+    const index = parseInt(localKey);
+    if (index === NaN) {
+      return false;
+    }
+    if (index < 0) {
+      throw 'Negative indices are not allowed as arrays do not serialize values at negative indices';
+    }
+    if (subkey) {
+      // pass the change down to a nested level
+      let proxy = this.readArray[index];
+      if (!isChangeset(proxy)) {
+        // no existing proxy
+        // so they're trying to set deep into an object that isn't yet proxied
+        // wrap the existing object or create an empty one
+        proxy = this.addProxy(index);
+      }
+      return proxy.set(subkey, value);
+    } else {
+      // this is a change at our level
+      // check the changeset key filter
+      if (requiresProxying(value)) {
+        value = this.addProxy(index, value);
+        return true;
+      }
+      // the value is a scalar value
+      this.writeArray[index] = value;
+      return true;
+    }
+  }
+
+  private addProxy<T>(index: number, value?: T): any {
+    // get sends just the key
+    // set sends the key and the new value
+    let proxyValue: T | {} = value ?? (this.__originalContent[index] as T) ?? {};
+    let proxy = new Proxy(proxyValue, handlerFor(proxyValue, this.options)) as IChangeset<T>;
+    this.writeArray[index] = proxy;
+    return proxy;
+  }
+
+  markChange(index: number, value: any) {
+    this.writeArray[index] = value;
+    // const oldValue = this.__originalContent[index];
+    // const unchanged = isUnchanged(value, oldValue);
+    // let changes = this.__changes;
+    // if (changes && changes.has(index)) {
+    //   // we have a pending change
+    //   // modify it or delete
+    //   if (unchanged) {
+    //     // we're back to the original value
+    //     // so delete the change
+    //     changes.delete(index);
+    //   } else {
+    //     // we know the key exists so the cast is safe
+    //     changes.set(index, value);
+    //   }
+    // } else if (!unchanged) {
+    //   // create a new pending change
+    //   if (!changes) {
+    //     this.__changes = changes = new Map<number, any>();
+    //   }
+    //   changes.set(index, value);
+    // }
+  }
+
+  public prepare(preparedChangedFn: PrepareChangesFn): this {
+    let changes: Record<string, any> = {};
+    for (let change of this.changes) {
+      changes[change.key] = change.value;
+    }
+    const modifiedChanges = preparedChangedFn(changes);
+    // clear all our changes
+    this.clearPending();
+    // and replace with these
+    if (modifiedChanges !== null) {
+      for (let key in modifiedChanges) {
+        const value = modifiedChanges[key];
+        this.setValue(key, value, NoValidation);
+      }
+    }
+    return this;
+  }
+
+  public execute(target?: TContentArray): this {
+    // apply the changes to the source
+    // but keep the changes for undo later
+    if (target === undefined) {
+      target = this.__originalContent;
+    }
+    if (this.isDirty) {
+      this.__undoState = target.concat([]); // copy the array;
+      if (this.__changes && this.isValid) {
+        replaceArrayContent(target, this.__changes);
+      }
+    }
+    return this;
+  }
+
+  on(eventName: string, callback: EventedCallback) {
+    const notifier = this.notifierForEvent(eventName);
+    return notifier.addListener(callback);
+  }
+
+  off(eventName: string, callback: EventedCallback) {
+    const notifier = this.notifierForEvent(eventName);
+    return notifier.removeListener(callback);
+  }
+
+  public unwrap(): this {
+    // deprecated
+    return this;
+  }
+
+  public unexecute(): this {
+    if (this.__changes !== undefined) {
+      // apply the undo state from the bottom up
+      for (let value of this.__changes) {
+        if (isChangeset(value)) {
+          value.unexecute();
+        }
+      }
+    }
+
+    if (this.__undoState) {
+      let oldStates = [...this.__undoState.entries()];
+      for (let [key, value] of oldStates) {
+        if (value === DeleteOnUndo) {
+          delete this.__originalContent[key];
+        } else {
+          this.__originalContent[key] = value;
+        }
+      }
+    }
+    // clear the undo state
+    this.__undoState = undefined;
+    return this;
+  }
+
+  private clearPending() {
+    this.__changes = undefined;
+    this.__undoState = undefined;
+  }
+
+  public rollbackProperty(_key: string): this {
+    // doesn't mean anything for arrays
+    this.trigger(AFTER_ROLLBACK_EVENT);
+    return this;
+  }
+
+  public rollback(): void {
+    // apply the undo state
+    if (this.__undoState) {
+      replaceArrayContent(this.__originalContent, this.__undoState);
+    }
+    this.clearPending();
+  }
+
+  public async validate(..._validationKeys: string[]): Promise<void> {}
+
+  public get change(): { [index: string]: any } | any[] {
+    let changes = this.changes;
+    // build a structure from them
+    let result = {};
+    for (let change of changes) {
+      setDeep(result, change.key, change.value);
+    }
+    return result;
+  }
+
+  public get changes(): Change[] {
+    let allChanges: Change[] = [];
+    let changes = this.__changes;
+    if (changes === undefined) {
+      return [];
+    }
+    let data = this.__originalContent;
+    for (let i = 0; i < changes.length; i++) {
+      let newValue = changes[i];
+      let oldValue = data[i];
+      if (!isUnchanged(newValue, oldValue)) {
+        // the value has changed at this index
+        if (isChangeset(newValue)) {
+          // has the object itself been replaced?
+          if (!isUnchanged(newValue.data, oldValue)) {
+            allChanges.push({
+              key: `${i}`,
+              value: newValue.content
+            });
+          }
+          // now add any changes within the object
+          let proxyChanges = newValue.changes;
+          for (let change of proxyChanges) {
+            allChanges.push({
+              key: `${i}.${change.key}`,
+              value: change.value
+            });
+          }
+        } else {
+          allChanges.push({
+            key: i.toString(),
+            value: newValue
+          });
+        }
+      }
+    }
+    return allChanges; //.sort((a, b) => (a.key === b.key ? 0 : a.key < b.key ? -1 : 1));
+  }
+
+  private trigger(eventName: string, ...args: any[]): void {
+    const notifier = this.notifierForEvent(eventName);
+    if (notifier) {
+      notifier.trigger(...args);
+    }
+  }
+
+  private notifierForEvent(eventName: string): Notifier<any> {
+    let notifiers = this.__eventedNotifiers;
+    if (notifiers === undefined) {
+      notifiers = this.__eventedNotifiers = new Map<string, Notifier<any>>();
+    }
+
+    if (!notifiers.has(eventName)) {
+      notifiers.set(eventName, new Notifier());
+    }
+
+    let notifier = notifiers.get(eventName) as Notifier<any>;
+
+    return notifier;
+  }
+
+  private options: ProxyOptions;
+  private __originalContent: TContentArray;
+  private __errors: Errors<any> = {};
+  private __errorsCache: Errors<any> = {};
+  private _runningValidations: RunningValidations = {};
+  private __undoState?: TContentArray;
+  private __changes?: TContentArray;
+  private __eventedNotifiers?: Map<string, Notifier<any>>;
+}
diff --git a/src/-private/changesets/proxy/changeset-object-proxy-handler.ts b/src/-private/changesets/proxy/changeset-object-proxy-handler.ts
new file mode 100644
index 0000000..f841de6
--- /dev/null
+++ b/src/-private/changesets/proxy/changeset-object-proxy-handler.ts
@@ -0,0 +1,960 @@
+import { Err, isObject, isPromise } from '../../..';
+import {
+  ChangeRecord,
+  Changes,
+  Errors,
+  IErr,
+  NewProperty,
+  PrepareChangesFn,
+  PublicErrors,
+  RunningValidations,
+  Snapshot,
+  TContentObject,
+  ValidationErr,
+  ValidationResult,
+  ValidatorAction
+} from '../../../types';
+import { flattenValidations } from '../../../utils/flatten-validations';
+import { ObjectTreeNode } from '../../../utils/object-tree-node';
+import Notifier from '../../notifier';
+import deleteErrorKey from '../../utils/delete-error-key';
+import getDeep from '../../utils/get-deep';
+import handlerFor from '../../utils/handler-for';
+import { ChangesetIdentityKey } from '../../utils/is-changeset';
+import isUnchanged from '../../utils/is-unchanged';
+import requiresProxying from '../../utils/requires-proxying';
+import splitKey from '../../utils/split-key';
+import {
+  AFTER_ROLLBACK_EVENT,
+  AFTER_VALIDATION_EVENT,
+  BEFORE_VALIDATION_EVENT,
+  EXECUTE_EVENT
+} from '../../utils/strings';
+import IChangesetProxyHandler from './changeset-proxy-handler-interface';
+import ProxyOptions from './proxy-options';
+import { ObjectReplaced, DeleteOnUndo } from './proxy-symbols';
+
+const NoValidation = false;
+
+interface EventedCallback {
+  (args: any[]): void;
+}
+
+export default class ChangesetObjectProxyHandler<T extends TContentObject>
+  implements IChangesetProxyHandler<T> {
+  constructor(source: T, options: ProxyOptions) {
+    this.__options = options || {};
+    this.__originalContent = source;
+    let keyFilters = options?.changesetKeys;
+    if (keyFilters) {
+      let localKeyFilters = []; // only the ones where our property is the leaf
+      for (let filter of keyFilters) {
+        let [localKey, subkey] = splitKey(filter);
+        if (!subkey) {
+          // it's a leaf
+          localKeyFilters.push(localKey);
+        }
+      }
+      this.__localChangesetKeyFilters = localKeyFilters;
+    }
+    if (options.getMap) {
+      this.__nestedProxies = options.getMap<string>();
+    } else {
+      this.__nestedProxies = new Map<string, any>();
+    }
+  }
+
+  public defineProperty(
+    target: Record<string, any>,
+    key: string,
+    desc: PropertyDescriptor
+  ): boolean {
+    // defining a property is a change
+    this.__changes.set(key, desc);
+    return true;
+  }
+
+  /**
+   * Proxy trap that intercepts get of all properties and methods.
+   *
+   * @method get
+   */
+  public get(_target: {}, key: string, proxy?: T): any {
+    if (!this.__outerProxy && proxy) {
+      // this is the first time that we are given our containing proxy
+      this.__outerProxy = proxy;
+      // add new properties to the proxy if they've been defined already
+      let changes = this.__changes;
+      for (let key of changes.keys()) {
+        let change = changes.get(key);
+        if (isObject(change)) {
+          // this is a defined property
+          Object.defineProperty(proxy, key, change);
+        }
+      }
+    }
+
+    // otherwise it's to be found on the wrapped object
+    return this.getValue(key);
+  }
+
+  /**
+   * Proxy trap that intercepts has key.
+   *
+   * @method has
+   */
+  public has(target: Record<string, any>, key: string) {
+    return Reflect.has(target, key) || this.__nestedProxies.has(key) || this.__changes.has(key);
+  }
+
+  public set(_target: {}, key: string, value: any): any {
+    return this.setValue(key, value);
+  }
+
+  public ownKeys(target: Record<string, any>) {
+    let keys = Object.keys(target);
+    for (let k of this.__nestedProxies.keys()) {
+      if (!keys.includes(k)) {
+        keys.push(k);
+      }
+    }
+    for (let k of this.__changes.keys()) {
+      if (!keys.includes(k)) {
+        keys.push(k);
+      }
+    }
+    return keys;
+  }
+
+  public getOwnPropertyDescriptor(
+    target: Record<string, any>,
+    key: string
+  ): PropertyDescriptor | undefined {
+    if (this.__nestedProxies.has(key)) {
+      return {
+        value: this.__nestedProxies.get(key),
+        writable: true,
+        configurable: true,
+        enumerable: true
+      };
+    }
+    if (this.__changes.has(key)) {
+      return {
+        value: this.__changes.get(key),
+        writable: true,
+        configurable: true,
+        enumerable: true
+      };
+    }
+    return Reflect.getOwnPropertyDescriptor(target, key);
+  }
+
+  public get error(): object {
+    return this.__errors;
+  }
+
+  public get errors(): PublicErrors {
+    // walk the tree of errors and flatten
+    let result: PublicErrors = [];
+    let recurse = (obj: Record<string, any>, parentKey: string | null) => {
+      for (let key of Object.keys(obj).sort()) {
+        let entry = obj[key];
+        let fullKey = parentKey ? `${parentKey}.${key}` : key;
+        if (entry instanceof Err) {
+          result.push({
+            key: fullKey,
+            value: entry.value,
+            validation: entry.validation
+          });
+        } else if (isObject(entry)) {
+          recurse(entry, fullKey);
+        }
+      }
+    };
+    recurse(this.__errors, null);
+    return result;
+  }
+
+  public get isDirty(): boolean {
+    // we're dirty if either we have top level changes
+    // or if a nested proxy is dirty
+    let locallyDirty = this.__changes.size > 0;
+    if (locallyDirty) {
+      return true;
+    }
+    for (let proxy of this.__nestedProxies.values()) {
+      if (proxy.isDirty) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  public get isPristine(): boolean {
+    return !this.isDirty;
+  }
+
+  public get isInvalid(): boolean {
+    return !this.isValid;
+  }
+
+  public get isValid(): boolean {
+    // validate this level
+    if (Object.keys(this.__errors).length > 0) {
+      return false;
+    }
+    // now look at all the nested proxies
+    for (let proxy of this.__nestedProxies.values()) {
+      if (!proxy.isValid) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  public get content(): T {
+    return this.__outerProxy;
+  }
+
+  public getValue(key: string): any {
+    if (key === ChangesetIdentityKey) {
+      return true;
+    }
+
+    // nested keys are separated by dots
+    let [localKey, subkey] = splitKey(key as string);
+
+    // is it an existing proxy?
+    if (this.__nestedProxies.has(localKey)) {
+      let proxy = this.__nestedProxies.get(localKey);
+      if (subkey) {
+        return proxy[subkey];
+      }
+      return proxy;
+    } else {
+      let changes = this.__changes;
+      if (changes.has(localKey)) {
+        // we have a pending change
+        // return it
+        // we know it's not undefined so we can safely cast it
+        let value = changes.get(localKey);
+        if (value !== ObjectReplaced) {
+          if (isObject(value)) {
+            if (value.get) {
+              value = value.get.bind(this.__outerProxy).call();
+            } else {
+              value = value.value;
+            }
+          }
+          if (subkey) {
+            return getDeep(value, subkey);
+          }
+          return value;
+        }
+      }
+    }
+    // drop back to the internal object property
+    // or a proxy of it if it's an object
+
+    let value = Reflect.get(this.__originalContent, localKey);
+    if (requiresProxying(value)) {
+      // we know that this key has not already been proxied
+      let proxy = this.addProxy(localKey);
+      if (subkey) {
+        return proxy[subkey];
+      }
+      return proxy;
+    }
+    return value;
+  }
+
+  public setValue(key: string, value: any, _validate = true): boolean {
+    // nested keys are separated by dots
+    let [localKey, subkey] = splitKey(key as string);
+
+    let result = false;
+    if (subkey) {
+      // pass the change down to a nested level
+      let proxy = this.__nestedProxies.get(localKey);
+      if (!proxy) {
+        // no existing proxy
+        // so they're trying to set deep into an object that isn't yet proxied
+        // wrap the existing object or create an empty one
+        proxy = this.addProxy(localKey);
+        // if there was a previous leaf value here, delete it
+        this.__changes.delete(localKey);
+      }
+      result = proxy.set(subkey, value);
+    } else {
+      // this is a change at our level
+      // check the changeset key filter
+      if (this.isKeyFilteredOut(localKey)) {
+        return false;
+      }
+      if (requiresProxying(value)) {
+        // mark the overwrite if this is a new object
+        let currentObject =
+          this.__nestedProxies.get(localKey)?.data ?? this.__originalContent[localKey];
+        if (isUnchanged(currentObject, value)) {
+          this.__changes.delete(localKey);
+        } else {
+          this.markChange(localKey, ObjectReplaced);
+        }
+        this.addProxy(localKey, value);
+      } else {
+        if (isUnchanged(value, this.__originalContent[localKey as keyof T])) {
+          this.__changes.delete(localKey);
+        } else {
+          // the value is a local property
+          this.markChange(localKey, value);
+        }
+        // remove a proxy if there was one with the same key
+        if (this.__nestedProxies.has(key)) {
+          this.__nestedProxies.delete(key);
+        }
+      }
+      result = true;
+    }
+    if (_validate && this.__options.skipValidate !== true) {
+      this._validateKey(key, value);
+    }
+    return result;
+  }
+
+  /**
+   * Creates a snapshot of the changeset's errors and changes.
+   *
+   * @method snapshot
+   */
+
+  snapshot(): Snapshot {
+    let changes: Changes = this.change;
+    let errors: Errors<any> = this.__errors;
+
+    return {
+      changes: Object.keys(changes).reduce((newObj: Changes, key: keyof Changes) => {
+        let change = changes[key];
+        if (isObject(change)) {
+          // clone it
+          change = Object.assign({}, change);
+        }
+        newObj[key] = change;
+        return newObj;
+      }, {}),
+
+      errors: Object.keys(errors).reduce((newObj: Errors<any>, key: keyof Errors<any>) => {
+        let e = errors[key];
+        newObj[key] = { value: e.value, validation: e.validation };
+        return newObj;
+      }, {})
+    };
+  }
+
+  /**
+   * Restores a snapshot of changes and errors. This overrides existing
+   * changes and errors.
+   *
+   * @method restore
+   */
+
+  restore({ changes, errors }: Snapshot): this {
+    this.clearPending();
+    if (changes) {
+      for (let key of Object.keys(changes)) {
+        let value = changes[key];
+        if (isObject(value)) {
+          // pass the change down to a nested level
+          let proxy = this.__nestedProxies.get(key);
+          if (!proxy) {
+            // no existing proxy
+            proxy = this.addProxy(key);
+          }
+          proxy.restore({ changes: value });
+        } else {
+          this.__changes.set(key, value);
+        }
+      }
+    }
+    if (errors) {
+      let newErrors: Errors<any> = Object.keys(errors).reduce(
+        (newObj: Errors<any>, key: keyof Changes) => {
+          let e: IErr<any> = errors[key];
+          newObj[key] = new Err(e.value, ...e.validation);
+          return newObj;
+        },
+        {}
+      );
+
+      // @tracked
+      this.__errors = newErrors;
+      this.__errorsCache = this.__errors;
+    }
+    return this;
+  }
+
+  public prepare(fn: PrepareChangesFn): this {
+    if (!fn) {
+      return this;
+    }
+    let changes: Record<string, any> = {};
+    for (let change of this.changes) {
+      changes[change.key] = change.value;
+    }
+    const modifiedChanges = fn(changes);
+    if (modifiedChanges === null || typeof modifiedChanges !== 'object') {
+      throw 'prepare callback must return an object';
+    }
+    // clear all our changes
+    this.clearPending();
+    // and replace with these
+    if (modifiedChanges !== null) {
+      for (let key in modifiedChanges) {
+        const value = modifiedChanges[key];
+        this.setValue(key, value, NoValidation);
+      }
+    }
+    return this;
+  }
+
+  on(eventName: string, callback: EventedCallback) {
+    const notifier = this.notifierForEvent(eventName);
+    return notifier.addListener(callback);
+  }
+
+  off(eventName: string, callback: EventedCallback) {
+    const notifier = this.notifierForEvent(eventName);
+    return notifier.removeListener(callback);
+  }
+
+  public cast(allowedKeys?: string[]): void {
+    if (!allowedKeys) {
+      return;
+    }
+    let allowedMap = new Map<string, null>();
+    for (let key of allowedKeys) {
+      allowedMap.set(key, null);
+    }
+    // property changes
+    let changes = this.__changes;
+    if (changes) {
+      let deletions = [];
+      for (let key of changes.keys()) {
+        if (!allowedMap.has(key)) {
+          deletions.push(key);
+        }
+      }
+      for (let key of deletions) {
+        changes.delete(key);
+      }
+    }
+    // nested proxies
+    let nestedProxies = this.__nestedProxies;
+    if (nestedProxies) {
+      let deletions = [];
+      for (let key of nestedProxies.keys()) {
+        if (!allowedMap.has(key)) {
+          deletions.push(key);
+        }
+      }
+      for (let key of deletions) {
+        nestedProxies.delete(key);
+      }
+    }
+    // undo state
+    let undoState = this.__undoState;
+    if (undoState) {
+      let deletions = [];
+      for (let key of undoState.keys()) {
+        if (!allowedMap.has(key)) {
+          deletions.push(key);
+        }
+      }
+      for (let key of deletions) {
+        undoState.delete(key);
+      }
+    }
+  }
+
+  public execute(target?: T): this {
+    if (target === undefined) {
+      target = this.__originalContent;
+    }
+    // execute the tree from the top down
+    if (!this.__undoState) {
+      this.__undoState = new Map<string, any>();
+    }
+    if (!this.__undoStateProxies) {
+      this.__undoStateProxies = new Map<string, any>();
+    }
+    // apply the changes to the source
+    // but keep the changes for undo later
+    if (this.isDirty && this.isValid) {
+      let changes = [...this.__changes.entries()];
+      for (let [key, newValue] of changes) {
+        // grab the old value for undo
+        let oldValue = Reflect.get(this.__originalContent, key);
+        if (oldValue === undefined) {
+          oldValue = DeleteOnUndo;
+        }
+        this.__undoState.set(key, oldValue);
+        // apply the new value
+        if (newValue === ObjectReplaced) {
+          // apply the entire proxy now
+          // and changes in the next phase below
+          Reflect.set(this.__originalContent, key, this.__nestedProxies.get(key).data);
+        } else if (isObject(newValue)) {
+          // this is a defineProperty descriptor
+          Reflect.defineProperty(this.__originalContent, key, newValue);
+        } else {
+          Reflect.set(this.__originalContent, key, newValue);
+        }
+      }
+    }
+    // now apply the data from the nested proxies
+    for (let [key, proxy] of this.__nestedProxies.entries()) {
+      if (!Reflect.has(this.__originalContent, key)) {
+        Reflect.set(this.__originalContent, key, proxy.data);
+        this.__undoState.set(key, DeleteOnUndo);
+      }
+      proxy.execute();
+      this.__undoStateProxies.set(key, proxy);
+    }
+    this.clearPending();
+    // trigger any registered callbacks by same keyword as method name
+    this.trigger(EXECUTE_EVENT);
+
+    return this;
+  }
+
+  public isValidating(key: string | void): boolean {
+    let runningValidations: RunningValidations = this._runningValidations;
+    let ks: string[] = Object.keys(runningValidations);
+    if (key) {
+      return ks.includes(key);
+    }
+    return ks.length > 0;
+  }
+
+  public rollback(): void {
+    // rollback from the bottom up to the previous execute
+
+    // roll back the proxies
+    for (let proxy of this.__nestedProxies.values()) {
+      proxy.rollback();
+    }
+
+    this.clearPending();
+    this.trigger(AFTER_ROLLBACK_EVENT);
+  }
+
+  rollbackInvalid(key: string | void): this {
+    if (!key) {
+      // clone the array so we can edit the object
+      // while iterating the keys
+      let keys = [...Object.keys(this.__errors)];
+      for (let key of keys) {
+        this.rollbackProperty(key);
+      }
+    } else if (this.__errors[key]) {
+      this.rollbackProperty(key);
+    }
+    return this;
+  }
+
+  public rollbackProperty(key: string): this {
+    // nested keys are separated by dots
+    let [localKey, subkey] = splitKey(key as string);
+
+    if (subkey) {
+      // it's meant for a child node
+      this.__nestedProxies.get(localKey)?.rollbackProperty(subkey);
+    } else {
+      this.__changes.delete(localKey);
+    }
+    delete this.__errors[key];
+    delete this.__errorsCache[key];
+    this.trigger(AFTER_ROLLBACK_EVENT);
+    return this;
+  }
+
+  public applyTo(target: T): this {
+    this.execute(target);
+    this.clearPending();
+    return this;
+  }
+
+  public unwrap(): this {
+    // deprecated
+    return this;
+  }
+
+  public unexecute(target?: T): this {
+    if (target === undefined) {
+      target = this.__originalContent;
+    }
+
+    // apply the undo state from the bottom up
+    if (this.__undoStateProxies) {
+      for (let [key, proxy] of this.__undoStateProxies.entries()) {
+        proxy.unexecute();
+        this.__nestedProxies.set(key, proxy);
+      }
+      this.__undoStateProxies = undefined;
+    }
+
+    if (this.__undoState) {
+      let oldStates = [...this.__undoState.entries()];
+      for (let [key, value] of oldStates) {
+        if (value === DeleteOnUndo) {
+          Reflect.deleteProperty(this.__originalContent, key);
+        } else {
+          Reflect.set(this.__originalContent, key, value);
+        }
+      }
+    }
+    // clear the undo state
+    this.__undoState = undefined;
+    return this;
+  }
+
+  /**
+   * Validates the changeset immediately against the validationMap passed in.
+   * If no key is passed into this method, it will validate all fields on the
+   * validationMap and set errors accordingly. Will throw an error if no
+   * validationMap is present.
+   *
+   * @method validate
+   */
+
+  public async validate(...validationKeys: string[]): Promise<any> {
+    // only called on the top level node
+    let validationMap = this.__options.validationMap || {};
+    if (Object.keys(validationMap as object).length === 0 && validationKeys.length > 0) {
+      return null;
+    }
+
+    validationKeys =
+      validationKeys.length > 0
+        ? validationKeys
+        : Object.keys(flattenValidations(validationMap as object));
+
+    let maybePromise = validationKeys.map(key => {
+      const value: any = this.getValue(key);
+      const resolvedValue = value instanceof ObjectTreeNode ? value.unwrap() : value;
+      return this._validateKey(key, resolvedValue);
+    });
+
+    return await Promise.all(maybePromise);
+  }
+
+  public get change(): { [index: string]: any } {
+    // property changes first
+    let result: { [index: string]: any } = {};
+    let changes = [...this.__changes.entries()];
+    for (let [key, value] of changes) {
+      if (value === ObjectReplaced) {
+        result[key] = this.__nestedProxies.get(key);
+      } else {
+        result[key as string] = value;
+      }
+    }
+    // now apply the __nestedProxies
+    for (let [key, proxy] of this.__nestedProxies.entries()) {
+      let thisChange = proxy.change;
+      if (Object.keys(thisChange).length > 0) {
+        result[key] = Object.assign(result[key] || {}, thisChange);
+      }
+    }
+    return result;
+  }
+
+  public get changes(): ChangeRecord[] {
+    let replacements: string[] = [];
+    let allChanges = [...this.__changes.entries()].map(([key, value]) => {
+      if (value === ObjectReplaced) {
+        replacements.push(key);
+        value = Object.assign({}, this.__nestedProxies.get(key));
+      }
+      return {
+        key,
+        value
+      };
+    });
+    // now add the proxy changes with the nested key
+    // except for the ones that were replaced
+    for (let [key, proxy] of this.__nestedProxies.entries()) {
+      if (replacements.includes(key)) {
+        continue;
+      }
+      let proxyChanges = proxy.changes;
+      for (let change of proxyChanges) {
+        allChanges.push({
+          key: `${key}.${change.key}`,
+          value: change.value
+        });
+      }
+    }
+    return allChanges.sort((a, b) => (a.key === b.key ? 0 : a.key < b.key ? -1 : 1));
+  }
+
+  /**
+   * Takes resolved validation and adds an error or simply returns the value
+   *
+   * @method _handleValidation
+   * @private
+   */
+  private _handleValidation<T>(
+    validationResult: ValidationResult,
+    { key, value }: NewProperty<T>
+  ): T | IErr<T> | ValidationErr {
+    const isValid: boolean = validationResult === true;
+
+    // Happy path: remove `key` from error map.
+    // @tracked
+    // ERRORS_CACHE to avoid backtracking Ember assertion.
+
+    this.__errors = deleteErrorKey(this.__errorsCache, key) as Errors<any>;
+
+    // Error case.
+    if (!isValid) {
+      return this.pushErrors(key, new Err(value, [validationResult as string]));
+    }
+
+    return value;
+  }
+
+  /**
+   * runs the validator with the key and value
+   *
+   * @method _validate
+   * @private
+   */
+  private _validate(
+    key: string,
+    newValue: unknown,
+    oldValue: unknown
+  ): ValidationResult | Promise<ValidationResult> {
+    let validator: ValidatorAction = this.__options.validateFn;
+    let content = this.__originalContent;
+
+    if (typeof validator === 'function') {
+      let validationResult = validator({
+        key,
+        newValue,
+        oldValue,
+        changes: this.change,
+        content
+      });
+
+      if (validationResult === undefined) {
+        // no validator function found for key
+        return true;
+      }
+
+      return validationResult;
+    }
+
+    return true;
+  }
+
+  /**
+   * Validates a specific key
+   *
+   * @method _validateKey
+   * @private
+   */
+  private _validateKey<T>(
+    key: string,
+    value: T
+  ): Promise<ValidationResult | T | IErr<T>> | T | IErr<T> | ValidationResult {
+    let content = this.__originalContent;
+    let oldValue: any = getDeep(content, key);
+    let validation: ValidationResult | Promise<ValidationResult> = this._validate(
+      key,
+      value,
+      oldValue
+    );
+
+    this.trigger(BEFORE_VALIDATION_EVENT, key);
+
+    // TODO: Address case when Promise is rejected.
+    if (isPromise(validation)) {
+      this._setIsValidating(key, validation as Promise<ValidationResult>);
+
+      let running: RunningValidations = this._runningValidations;
+      let promises = Object.entries(running);
+
+      return Promise.all(promises).then(() => {
+        return (validation as Promise<ValidationResult>)
+          .then((resolvedValidation: ValidationResult) => {
+            delete running[key];
+
+            return this._handleValidation(resolvedValidation, { key, value });
+          })
+          .then(result => {
+            this.trigger(AFTER_VALIDATION_EVENT, key);
+            return result;
+          });
+      });
+    }
+
+    let result = this._handleValidation(validation as ValidationResult, { key, value });
+
+    this.trigger(AFTER_VALIDATION_EVENT, key);
+
+    return result;
+  }
+
+  public pushErrors<T>(_key: string, ..._newErrors: (ValidationErr | IErr<T>)[]): IErr<any> {
+    /*    let errors: Errors<any> = this.__errors;
+    let existingError: IErr<any> | Err = getDeep(errors, key) || new Err(null, []);
+    let validation: ValidationErr | ValidationErr[] = existingError.validation;
+    let value: any = this.getValue(key);
+
+    if (Boolean(validation)) {
+      existingError.validation = [validation];
+    }
+
+    let v = existingError.validation;
+    validation = [...v, ...newErrors];
+    // let newError = new Err(value, validation);
+    // @tracked
+    // this.__errors = setDeep(errors, key as string, newError, { safeSet });
+    this.__errorsCache = this.__errors;
+
+    return { value, validation }; */
+    return new Err('', ['']);
+  }
+
+  get originalContent(): T {
+    return this.__originalContent;
+  }
+
+  /**
+   * Increment or decrement the number of running validations for a
+   * given key.
+   */
+  private _setIsValidating(_key: string, _promise: Promise<ValidationResult>): void {
+    // let running: RunningValidations = this._runningValidations;
+    // setDeep(running, key, promise);
+  }
+
+  private clearPending() {
+    this.__nestedProxies.clear();
+    this.__changes.clear();
+    this.__errors = {};
+    this.__errorsCache = {};
+  }
+
+  private markChange(localKey: string, value: any) {
+    const oldValue = Reflect.get(this.__originalContent, localKey);
+    const unchanged = isUnchanged(value, oldValue);
+    let changes = this.__changes;
+    if (changes.has(localKey)) {
+      // we have a pending change
+      // modify it or delete
+      if (unchanged) {
+        // we're back to the original value
+        // so delete the change
+        changes.delete(localKey);
+      } else {
+        // we know the key exists so the cast is safe
+        changes.set(localKey, value);
+      }
+    } else if (!unchanged) {
+      // create a new pending change
+      changes.set(localKey, value);
+    }
+  }
+
+  // /**
+  //  * String representation for the changeset.
+  //  */
+  // get [Symbol.toStringTag](): string {
+  //   let normalisedContent: object = pureAssign(this.__originalContent, {});
+  //   return `changeset:${normalisedContent.toString()}`;
+  // }
+
+  private addProxy(key: string, value?: {}): any {
+    // get sends just the key
+    // set sends the key and the new value
+    if (value === undefined) {
+      // use the original
+      value = Reflect.get(this.__originalContent, key);
+    }
+    if (value === undefined) {
+      // missing on original but added in the changeset
+      value = {};
+    }
+    let options = this.__options;
+    if (options.changesetKeys) {
+      // filter the changeset keys for the child
+      let filteredKeys: any[] | undefined = [];
+      let foundLeafNode = false;
+      for (let changesetKey of options.changesetKeys) {
+        let [localKey, subkey] = splitKey(changesetKey);
+        if (localKey === key) {
+          if (subkey) {
+            filteredKeys.push(subkey);
+          } else {
+            // this is the leaf node of the changeset key
+            // so allow all changes below here
+            foundLeafNode = true;
+          }
+        }
+      }
+      if (foundLeafNode && filteredKeys.length == 0) {
+        filteredKeys = undefined;
+      }
+      // make a copy
+      options = Object.assign({}, options);
+      options.changesetKeys = filteredKeys;
+    }
+    let proxy = new Proxy(value, handlerFor(value, options));
+    this.__nestedProxies.set(key, proxy);
+    return proxy;
+  }
+
+  private isKeyFilteredOut(key: string) {
+    return (
+      this.__localChangesetKeyFilters !== undefined &&
+      !this.__localChangesetKeyFilters.includes(key)
+    );
+  }
+
+  private trigger(eventName: string, ...args: any[]): void {
+    const notifier = this.notifierForEvent(eventName);
+    if (notifier) {
+      notifier.trigger(...args);
+    }
+  }
+
+  private notifierForEvent(eventName: string): Notifier<any> {
+    let notifiers = this.__eventedNotifiers;
+    if (notifiers === undefined) {
+      notifiers = this.__eventedNotifiers = new Map<string, Notifier<any>>();
+    }
+
+    if (!notifiers.has(eventName)) {
+      notifiers.set(eventName, new Notifier());
+    }
+
+    let notifier = notifiers.get(eventName) as Notifier<any>;
+
+    return notifier;
+  }
+
+  private __options: ProxyOptions;
+  private _runningValidations: RunningValidations = {};
+  private __localChangesetKeyFilters?: string[]; // only where our property is the leaf
+  private __originalContent: T;
+  private __errors: Errors<any> = {};
+  private __errorsCache: Errors<any> = {};
+  private __undoState: Map<string, any> | undefined;
+  private __undoStateProxies: Map<string, any> | undefined;
+  private __nestedProxies: Map<string, any>;
+  private __changes: Map<string, any> = new Map<string, any>();
+  private __eventedNotifiers?: Map<string, Notifier<any>>;
+  private __outerProxy!: T;
+  private __prepareFn?: PrepareChangesFn;
+}
diff --git a/src/-private/changesets/proxy/changeset-proxy-handler-interface.ts b/src/-private/changesets/proxy/changeset-proxy-handler-interface.ts
new file mode 100644
index 0000000..a70373d
--- /dev/null
+++ b/src/-private/changesets/proxy/changeset-proxy-handler-interface.ts
@@ -0,0 +1,41 @@
+import {
+  ChangeRecord,
+  IErr,
+  PrepareChangesFn,
+  PublicErrors,
+  Snapshot,
+  TContent,
+  ValidationErr
+} from '../../../types';
+
+export interface Change {
+  key: string;
+  value: any;
+}
+
+export default interface IChangesetProxyHandler<T extends TContent> extends ProxyHandler<T> {
+  changes: ChangeRecord[];
+  errors: PublicErrors;
+  error: object;
+  change: object;
+
+  isDirty: boolean;
+  isPristine: boolean;
+  isValid: boolean;
+  isInvalid: boolean;
+  content: T;
+  originalContent: T;
+  execute(): this;
+  isValidating(key: string | void): boolean;
+  prepare(preparedChangedFn: PrepareChangesFn): this;
+  applyTo(target?: T): this;
+  pushErrors<T>(key: string, ...newErrors: (ValidationErr | IErr<T>)[]): IErr<any>;
+  restore(obj: Snapshot): this;
+  rollback(): void;
+  rollbackInvalid(key: string | void): this;
+  rollbackProperty(key: string): this;
+  snapshot(): Snapshot;
+  unexecute(): this;
+  unwrap(): this; // deprecated
+  validate(...keys: string[]): Promise<any>;
+}
diff --git a/src/-private/changesets/proxy/proxy-options.ts b/src/-private/changesets/proxy/proxy-options.ts
new file mode 100644
index 0000000..4dbe1f1
--- /dev/null
+++ b/src/-private/changesets/proxy/proxy-options.ts
@@ -0,0 +1,16 @@
+import { Config, ValidatorAction, ValidatorMap } from '../../../types';
+
+export interface ArrayWrapperFn {
+  (source: any[]): any[];
+}
+
+export interface MapConstructorFn {
+  <TKey>(): Map<TKey, any>;
+}
+
+export default interface ProxyOptions extends Config {
+  getArrayStorage?: ArrayWrapperFn;
+  getMap?: MapConstructorFn;
+  validateFn?: ValidatorAction;
+  validationMap?: ValidatorMap | null;
+}
diff --git a/src/-private/changesets/proxy/proxy-symbols.ts b/src/-private/changesets/proxy/proxy-symbols.ts
new file mode 100644
index 0000000..c12fef4
--- /dev/null
+++ b/src/-private/changesets/proxy/proxy-symbols.ts
@@ -0,0 +1,3 @@
+export const ProxyArrayValueKey = '__changeset_proxy_array_value';
+export const DeleteOnUndo = Symbol('changeset_undefined_value');
+export const ObjectReplaced = Symbol('changeset_object_replaced');
diff --git a/src/-private/err.ts b/src/-private/err.ts
index adfbd57..b4dd37b 100644
--- a/src/-private/err.ts
+++ b/src/-private/err.ts
@@ -2,9 +2,9 @@ import { IErr, ValidationErr } from '../types';
 
 export default class Err implements IErr<any> {
   value: any;
-  validation: ValidationErr | ValidationErr[];
+  validation: ValidationErr[];
 
-  constructor(value: any, validation: ValidationErr | ValidationErr[]) {
+  constructor(value: any, ...validation: ValidationErr[]) {
     this.value = value;
     this.validation = validation;
   }
diff --git a/src/-private/utils/assert.ts b/src/-private/utils/assert.ts
new file mode 100644
index 0000000..1132da9
--- /dev/null
+++ b/src/-private/utils/assert.ts
@@ -0,0 +1,9 @@
+import { DEBUG } from './consts';
+
+export default function assert(msg: string, property: unknown): void {
+  if (DEBUG) {
+    if (!property) {
+      throw new Error(msg);
+    }
+  }
+}
diff --git a/src/-private/utils/consts.ts b/src/-private/utils/consts.ts
new file mode 100644
index 0000000..26bb8b5
--- /dev/null
+++ b/src/-private/utils/consts.ts
@@ -0,0 +1,4 @@
+export const { keys } = Object;
+export const defaultValidatorFn = () => true;
+export const defaultOptions = { skipValidate: false };
+export const DEBUG = process.env.NODE_ENV !== 'production';
diff --git a/src/-private/utils/delete-error-key.ts b/src/-private/utils/delete-error-key.ts
new file mode 100644
index 0000000..f73e154
--- /dev/null
+++ b/src/-private/utils/delete-error-key.ts
@@ -0,0 +1,41 @@
+import isObject from '../utils/is-object';
+import { InternalMap } from '../../types';
+import { isChange } from '../change';
+
+export default function deleteErrorKey(obj: InternalMap, key = ''): InternalMap {
+  let keys = key.split('.');
+
+  if (keys.length === 1 && obj.hasOwnProperty(key)) {
+    delete obj[key];
+  } else if (obj[keys[0]]) {
+    let recurse = (parentNode: { [key: string]: any }, remainingKeys: string[]) => {
+      let [childKey, ...remaining] = remainingKeys;
+      let childNode: any = parentNode[childKey];
+
+      if (!childNode) {
+        // node is already missing
+        return;
+      }
+      // depth first
+      if (remaining.length > 0) {
+        recurse(childNode, remaining);
+      }
+      // delete leaf and empty branch from map
+      if (isObject(childNode) && childKey) {
+        let curr: { [key: string]: unknown } = childNode;
+        if (
+          isChange(curr) ||
+          typeof curr.value !== 'undefined' ||
+          curr.validation ||
+          Object.keys(curr).length === 0
+        ) {
+          delete parentNode[childKey];
+          return;
+        }
+      }
+    };
+    recurse(obj, keys);
+  }
+
+  return obj;
+}
diff --git a/src/utils/get-deep.ts b/src/-private/utils/get-deep.ts
similarity index 95%
rename from src/utils/get-deep.ts
rename to src/-private/utils/get-deep.ts
index 59f1adb..d594144 100644
--- a/src/utils/get-deep.ts
+++ b/src/-private/utils/get-deep.ts
@@ -1,4 +1,4 @@
-import { isChange, getChangeValue } from '../-private/change';
+import { getChangeValue, isChange } from '../change';
 
 /**
  * Handles both single key or nested string keys ('person.name')
diff --git a/src/-private/utils/handler-for.ts b/src/-private/utils/handler-for.ts
new file mode 100644
index 0000000..2c0cb55
--- /dev/null
+++ b/src/-private/utils/handler-for.ts
@@ -0,0 +1,15 @@
+import { TContent } from '../../types';
+import ChangesetArrayProxyHandler from '../changesets/proxy/changeset-array-proxy-handler';
+import ChangesetObjectProxyHandler from '../changesets/proxy/changeset-object-proxy-handler';
+import IChangesetProxyHandler from '../changesets/proxy/changeset-proxy-handler-interface';
+import ProxyOptions from '../changesets/proxy/proxy-options';
+
+export default function handlerFor<T extends TContent>(
+  value: T,
+  options: ProxyOptions
+): IChangesetProxyHandler<T> {
+  if (Array.isArray(value)) {
+    return new ChangesetArrayProxyHandler(value, options);
+  }
+  return new ChangesetObjectProxyHandler(value, options);
+}
diff --git a/src/-private/utils/is-changeset.ts b/src/-private/utils/is-changeset.ts
new file mode 100644
index 0000000..578f970
--- /dev/null
+++ b/src/-private/utils/is-changeset.ts
@@ -0,0 +1,9 @@
+export const ChangesetIdentitySymbol = Symbol('validated_changeset_change_proxy_identity');
+export const ChangesetIdentityKey = Symbol.keyFor(ChangesetIdentitySymbol);
+
+export function isChangeset(obj: any) {
+  if (obj[ChangesetIdentitySymbol] === true) {
+    return true;
+  }
+  return false;
+}
diff --git a/src/-private/utils/is-equal.ts b/src/-private/utils/is-equal.ts
new file mode 100644
index 0000000..0907f20
--- /dev/null
+++ b/src/-private/utils/is-equal.ts
@@ -0,0 +1,8 @@
+// determine if two values are equal
+export default function isEqual(v1: unknown, v2: unknown) {
+  if (v1 instanceof Date && v2 instanceof Date) {
+    return v1.getTime() === v2.getTime();
+  }
+
+  return v1 === v2;
+}
diff --git a/src/utils/is-object.ts b/src/-private/utils/is-object.ts
similarity index 100%
rename from src/utils/is-object.ts
rename to src/-private/utils/is-object.ts
diff --git a/src/-private/utils/is-unchanged.ts b/src/-private/utils/is-unchanged.ts
new file mode 100644
index 0000000..bd96102
--- /dev/null
+++ b/src/-private/utils/is-unchanged.ts
@@ -0,0 +1,6 @@
+export default function isUnchanged(a: any, b: any) {
+  if (a instanceof Date && b instanceof Date) {
+    return (a as Date).getTime() === (b as Date).getTime();
+  }
+  return a === b;
+}
diff --git a/src/-private/utils/maybe-unwrap-proxy.ts b/src/-private/utils/maybe-unwrap-proxy.ts
new file mode 100644
index 0000000..7ba3fb7
--- /dev/null
+++ b/src/-private/utils/maybe-unwrap-proxy.ts
@@ -0,0 +1,5 @@
+import { Content } from '../../types';
+
+export default function maybeUnwrapProxy(content: Content): any {
+  return content;
+}
diff --git a/src/-private/utils/replace-array-content.ts b/src/-private/utils/replace-array-content.ts
new file mode 100644
index 0000000..00a3b07
--- /dev/null
+++ b/src/-private/utils/replace-array-content.ts
@@ -0,0 +1,3 @@
+export default function replaceArrayContent(target: any[], newContent: any[]) {
+  target.splice(0, target.length, ...newContent);
+}
diff --git a/src/-private/utils/requires-proxying.ts b/src/-private/utils/requires-proxying.ts
new file mode 100644
index 0000000..bca7cdb
--- /dev/null
+++ b/src/-private/utils/requires-proxying.ts
@@ -0,0 +1,6 @@
+export default function requiresProxying(value: any): boolean {
+  if (value === null) {
+    return false;
+  }
+  return typeof value === 'object' && !((value as any) instanceof Date); // we don't need to proxy a Date
+}
diff --git a/src/-private/utils/safe-set.ts b/src/-private/utils/safe-set.ts
new file mode 100644
index 0000000..3dc0637
--- /dev/null
+++ b/src/-private/utils/safe-set.ts
@@ -0,0 +1,3 @@
+export default function safeSet(obj: any, key: string, value: unknown) {
+  return (obj[key] = value);
+}
diff --git a/src/utils/set-deep.ts b/src/-private/utils/set-deep.ts
similarity index 97%
rename from src/utils/set-deep.ts
rename to src/-private/utils/set-deep.ts
index 8418283..50456b2 100644
--- a/src/utils/set-deep.ts
+++ b/src/-private/utils/set-deep.ts
@@ -1,6 +1,6 @@
-import Change, { getChangeValue, isChange } from '../-private/change';
+import Change, { getChangeValue, isChange } from '../change';
 import isObject from './is-object';
-import { isArrayObject } from './array-object';
+import { isArrayObject } from '../../utils/array-object';
 
 interface Options {
   safeSet?: any;
diff --git a/src/-private/utils/split-key.ts b/src/-private/utils/split-key.ts
new file mode 100644
index 0000000..8097ed0
--- /dev/null
+++ b/src/-private/utils/split-key.ts
@@ -0,0 +1,16 @@
+export default function splitKey(key: string): [string, string | null] {
+  if (!key.split) {
+    // key isn't a string
+    return [key, null];
+  }
+  let firstKeyPart = key.split('.', 1)[0];
+  let subKey = null;
+  if (key.length > firstKeyPart.length) {
+    subKey = key.substring(firstKeyPart.length + 1, key.length);
+  }
+  if (firstKeyPart === '_content' && subKey) {
+    //deprecate this - only here for backwards compatibility
+    [firstKeyPart, subKey] = splitKey(subKey);
+  }
+  return [firstKeyPart, subKey];
+}
diff --git a/src/-private/utils/strings.ts b/src/-private/utils/strings.ts
new file mode 100644
index 0000000..f2eb797
--- /dev/null
+++ b/src/-private/utils/strings.ts
@@ -0,0 +1,12 @@
+export const CONTENT = '_content';
+export const PREVIOUS_CONTENT = '_previousContent';
+export const CHANGES = '_changes';
+export const ERRORS = '_errors';
+export const ERRORS_CACHE = '_errorsCache';
+export const VALIDATOR = '_validator';
+export const OPTIONS = '_options';
+export const RUNNING_VALIDATIONS = '_runningValidations';
+export const BEFORE_VALIDATION_EVENT = 'beforeValidation';
+export const AFTER_VALIDATION_EVENT = 'afterValidation';
+export const AFTER_ROLLBACK_EVENT = 'afterRollback';
+export const EXECUTE_EVENT = 'execute';
diff --git a/src/index.ts b/src/index.ts
index 74de8fa..8805c10 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,52 +1,26 @@
 import Change, { getChangeValue, isChange } from './-private/change';
-import { getKeyValues, getKeyErrorValues } from './utils/get-key-values';
+import { getKeyValues } from './utils/get-key-values';
 import lookupValidator from './utils/validator-lookup';
-import { notifierForEvent } from './-private/evented';
 import Err from './-private/err';
-import { hasKey, pathInChanges } from './utils/has-key';
 import normalizeObject from './utils/normalize-object';
-import { hasChanges } from './utils/has-changes';
 import pureAssign from './utils/assign';
-import { flattenValidations } from './utils/flatten-validations';
-import isChangeset, { CHANGESET } from './utils/is-changeset';
-import isObject from './utils/is-object';
+import isObject from './-private/utils/is-object';
 import isPromise from './utils/is-promise';
 import keyInObject from './utils/key-in-object';
 import mergeNested from './utils/merge-nested';
 import { buildOldValues } from './utils/build-old-values';
-import { ObjectTreeNode } from './utils/object-tree-node';
 import objectWithout from './utils/object-without';
 import take from './utils/take';
 import mergeDeep, { propertyIsUnsafe } from './utils/merge-deep';
-import setDeep from './utils/set-deep';
-import getDeep, { getSubObject } from './utils/get-deep';
-import { objectToArray, arrayToObject } from './utils/array-object';
 
-import {
-  Changes,
-  Config,
-  Content,
-  Errors,
-  IErr,
-  IChangeset,
-  INotifier,
-  InternalMap,
-  NewProperty,
-  PrepareChangesFn,
-  RunningValidations,
-  Snapshot,
-  ValidationErr,
-  ValidationResult,
-  ValidatorAction,
-  ValidatorMap
-} from './types';
+import { Config, IChangeset, ValidatorAction, ValidatorMap } from './types';
+import Changeset from './-private/changesets/changeset';
 
 export {
-  CHANGESET,
   Change,
   Err,
+  IChangeset,
   buildOldValues,
-  isChangeset,
   isObject,
   isChange,
   getChangeValue,
@@ -60,1060 +34,19 @@ export {
   pureAssign,
   take,
   mergeDeep,
-  setDeep,
-  getDeep,
   propertyIsUnsafe
 };
 
-const { keys } = Object;
-const CONTENT = '_content';
-const PREVIOUS_CONTENT = '_previousContent';
-const CHANGES = '_changes';
-const ERRORS = '_errors';
-const ERRORS_CACHE = '_errorsCache';
-const VALIDATOR = '_validator';
-const OPTIONS = '_options';
-const RUNNING_VALIDATIONS = '_runningValidations';
-const BEFORE_VALIDATION_EVENT = 'beforeValidation';
-const AFTER_VALIDATION_EVENT = 'afterValidation';
-const AFTER_ROLLBACK_EVENT = 'afterRollback';
-const defaultValidatorFn = () => true;
-const defaultOptions = { skipValidate: false };
-
-const DEBUG = process.env.NODE_ENV !== 'production';
-
-function assert(msg: string, property: unknown): void {
-  if (DEBUG) {
-    if (!property) {
-      throw new Error(msg);
-    }
-  }
-}
-
-function maybeUnwrapProxy(content: Content): any {
-  return content;
-}
-
-export class BufferedChangeset implements IChangeset {
-  constructor(
-    obj: object,
-    public validateFn: ValidatorAction = defaultValidatorFn,
-    public validationMap: ValidatorMap = {},
-    options: Config = {}
-  ) {
-    this[CONTENT] = obj;
-    this[PREVIOUS_CONTENT] = undefined;
-    this[CHANGES] = {};
-    this[ERRORS] = {};
-    this[ERRORS_CACHE] = {};
-    this[VALIDATOR] = validateFn;
-    this[OPTIONS] = pureAssign(defaultOptions, JSON.parse(JSON.stringify(options)));
-    this[RUNNING_VALIDATIONS] = {};
-  }
-
-  /**
-   * Any property that is not one of the getter/setter/methods on the
-   * BufferedProxy instance. The value type is `unknown` in order to avoid
-   * having to predefine key/value pairs of the correct types in the target
-   * object. Setting the index signature to `[key: string]: T[K]` would allow us
-   * to typecheck the value that is set on the proxy. However, no
-   * getters/setters/methods can be added to the class. This is the tradeoff
-   * we make for this particular design pattern (class based BufferedProxy).
-   */
-  [key: string]: unknown;
-  [CONTENT]: object;
-  [PREVIOUS_CONTENT]: object | undefined;
-  [CHANGES]: Changes;
-  [ERRORS]: Errors<any>;
-  [ERRORS_CACHE]: Errors<any>;
-  [VALIDATOR]: ValidatorAction;
-  [OPTIONS]: Config;
-  [RUNNING_VALIDATIONS]: {};
-
-  __changeset__ = CHANGESET;
-
-  _eventedNotifiers = {};
-
-  on(eventName: string, callback: Function): INotifier {
-    const notifier = notifierForEvent(this, eventName);
-    return notifier.addListener(callback);
-  }
-
-  off(eventName: string, callback: Function): INotifier {
-    const notifier = notifierForEvent(this, eventName);
-    return notifier.removeListener(callback);
-  }
-
-  trigger(eventName: string, ...args: any[]): void {
-    const notifier = notifierForEvent(this, eventName);
-    if (notifier) {
-      notifier.trigger(...args);
-    }
-  }
-
-  /**
-   * @property isObject
-   * @override
-   */
-  isObject = isObject;
-
-  /**
-   * @property maybeUnwrapProxy
-   * @override
-   */
-  maybeUnwrapProxy = maybeUnwrapProxy;
-
-  /**
-   * @property setDeep
-   * @override
-   */
-  setDeep = setDeep;
-
-  /**
-   * @property getDeep
-   * @override
-   */
-  getDeep = getDeep;
-
-  /**
-   * @property mergeDeep
-   * @override
-   */
-  mergeDeep = mergeDeep;
-
-  /**
-   * @property safeGet
-   * @override
-   */
-  safeGet(obj: any, key: string) {
-    return obj[key];
-  }
-
-  /**
-   * @property safeSet
-   * @override
-   */
-  safeSet(obj: any, key: string, value: unknown) {
-    return (obj[key] = value);
-  }
-
-  get _bareChanges() {
-    let obj = this[CHANGES];
-
-    return getKeyValues(obj).reduce((newObj: { [key: string]: any }, { key, value }) => {
-      newObj[key] = value;
-      return newObj;
-    }, Object.create(null));
-  }
-
-  /**
-   * @property changes
-   * @type {Array}
-   */
-  get changes() {
-    let obj = this[CHANGES];
-
-    // [{ key, value }, ...]
-    return getKeyValues(obj);
-  }
-
-  /**
-   * @property errors
-   * @type {Array}
-   */
-  get errors() {
-    let obj = this[ERRORS];
-
-    // [{ key, validation, value }, ...]
-    return getKeyErrorValues(obj);
-  }
-
-  get change() {
-    let obj: Changes = this[CHANGES];
-    if (hasChanges(this[CHANGES])) {
-      return normalizeObject(obj);
-    }
-
-    return {};
-  }
-
-  get error() {
-    return this[ERRORS];
-  }
-
-  get data() {
-    return this[CONTENT];
-  }
-
-  /**
-   * @property isValid
-   * @type {Array}
-   */
-  get isValid() {
-    return getKeyErrorValues(this[ERRORS]).length === 0;
-  }
-  /**
-   * @property isPristine
-   * @type {Boolean}
-   */
-  get isPristine() {
-    let validationKeys = Object.keys(this[CHANGES]);
-    const userChangesetKeys: string[] | undefined = this[OPTIONS].changesetKeys;
-    if (Array.isArray(userChangesetKeys) && userChangesetKeys.length) {
-      validationKeys = validationKeys.filter(k => userChangesetKeys.includes(k));
-    }
-
-    if (validationKeys.length === 0) {
-      return true;
-    }
-
-    return !hasChanges(this[CHANGES]);
-  }
-  /**
-   * @property isInvalid
-   * @type {Boolean}
-   */
-  get isInvalid() {
-    return !this.isValid;
-  }
-  /**
-   * @property isDirty
-   * @type {Boolean}
-   */
-  get isDirty() {
-    return !this.isPristine;
-  }
-
-  /**
-   * Stores change on the changeset.
-   * This approximately works just like the Ember API
-   *
-   * @method setUnknownProperty
-   */
-  setUnknownProperty<T>(key: string, value: T): void {
-    let config: Config = this[OPTIONS];
-    let changesetKeys = config.changesetKeys;
-    if (Array.isArray(changesetKeys) && changesetKeys.length > 0) {
-      const hasKey = changesetKeys.find(chKey => key.match(chKey));
-      if (!hasKey) {
-        return;
-      }
-    }
-
-    let content: Content = this[CONTENT];
-    let oldValue = this.safeGet(content, key);
-
-    let skipValidate: boolean | undefined = config.skipValidate;
-    if (skipValidate) {
-      this._setProperty({ key, value, oldValue });
-      this._handleValidation(true, { key, value });
-      return;
-    }
-
-    this._setProperty({ key, value, oldValue });
-    this._validateKey(key, value);
-  }
-
-  /**
-   * String representation for the changeset.
-   */
-  get [Symbol.toStringTag](): string {
-    let normalisedContent: object = pureAssign(this[CONTENT], {});
-    return `changeset:${normalisedContent.toString()}`;
-  }
-
-  /**
-   * String representation for the changeset.
-   */
-  toString(): string {
-    let normalisedContent: object = pureAssign(this[CONTENT], {});
-    return `changeset:${normalisedContent.toString()}`;
-  }
-
-  /**
-   * Provides a function to run before emitting changes to the model. The
-   * callback function must return a hash in the same shape:
-   *
-   * ```
-   * changeset
-   *   .prepare((changes) => {
-   *     let modified = {};
-   *
-   *     for (let key in changes) {
-   *       modified[underscore(key)] = changes[key];
-   *     }
-   *
-   *    return modified; // { first_name: "Jim", last_name: "Bob" }
-   *  })
-   *  .execute(); // execute the changes
-   * ```
-   *
-   * @method prepare
-   */
-  prepare(prepareChangesFn: PrepareChangesFn): this {
-    let changes: { [s: string]: any } = this._bareChanges;
-    let preparedChanges = prepareChangesFn(changes);
-
-    assert('Callback to `changeset.prepare` must return an object', this.isObject(preparedChanges));
-
-    let newObj: Changes = {};
-    if (this.isObject(preparedChanges)) {
-      let newChanges: Changes = keys(preparedChanges as Record<string, any>).reduce(
-        (newObj: Changes, key: keyof Changes) => {
-          newObj[key] = new Change((preparedChanges as Record<string, any>)[key]);
-          return newObj;
-        },
-        newObj
-      );
-
-      // @tracked
-      this[CHANGES] = newChanges;
-    }
-
-    return this;
-  }
-
-  /**
-   * Executes the changeset if in a valid state.
-   *
-   * @method execute
-   */
-  execute(): this {
-    let oldContent;
-    if (this.isValid && this.isDirty) {
-      let content: Content = this[CONTENT];
-      let changes: Changes = this[CHANGES];
-
-      // keep old values in case of error and we want to rollback
-      oldContent = buildOldValues(content, this.changes, this.getDeep);
-
-      // we want mutation on original object
-      // @tracked
-      this[CONTENT] = this.mergeDeep(content, changes);
-    }
-
-    // trigger any registered callbacks by same keyword as method name
-    this.trigger('execute');
-
-    this[CHANGES] = {};
-    this[PREVIOUS_CONTENT] = oldContent;
-
-    return this;
-  }
-
-  unexecute(): this {
-    if (this[PREVIOUS_CONTENT]) {
-      this[CONTENT] = this.mergeDeep(this[CONTENT], this[PREVIOUS_CONTENT], {
-        safeGet: this.safeGet,
-        safeSet: this.safeSet
-      });
-    }
-
-    return this;
-  }
-
-  /**
-   * Executes the changeset and saves the underlying content.
-   *
-   * @method save
-   * @param {Object} options optional object to pass to content save method
-   */
-  async save(options?: object): Promise<IChangeset | any> {
-    let content: Content = this[CONTENT];
-    let savePromise: any | Promise<BufferedChangeset | any> = Promise.resolve(this);
-    this.execute();
-
-    if (typeof content.save === 'function') {
-      savePromise = content.save(options);
-    } else if (typeof this.safeGet(content, 'save') === 'function') {
-      // we might be getting this off a proxy object.  For example, when a
-      // belongsTo relationship (a proxy on the parent model)
-      // another way would be content(belongsTo).content.save
-      let maybePromise = this.maybeUnwrapProxy(content).save();
-      if (maybePromise) {
-        savePromise = maybePromise;
-      }
-    }
-
-    try {
-      const result = await savePromise;
-
-      // cleanup changeset
-      this.rollback();
-
-      return result;
-    } catch (e) {
-      throw e;
-    }
-  }
-
-  /**
-   * Merges 2 valid changesets and returns a new changeset. Both changesets
-   * must point to the same underlying object. The changeset target is the
-   * origin. For example:
-   *
-   * ```
-   * let changesetA = new Changeset(user, validatorFn);
-   * let changesetB = new Changeset(user, validatorFn);
-   * changesetA.set('firstName', 'Jim');
-   * changesetB.set('firstName', 'Jimmy');
-   * changesetB.set('lastName', 'Fallon');
-   * let changesetC = changesetA.merge(changesetB);
-   * changesetC.execute();
-   * user.get('firstName'); // "Jimmy"
-   * user.get('lastName'); // "Fallon"
-   * ```
-   *
-   * @method merge
-   */
-  merge(changeset: this): this {
-    let content: Content = this[CONTENT];
-    assert('Cannot merge with a non-changeset', isChangeset(changeset));
-    assert('Cannot merge with a changeset of different content', changeset[CONTENT] === content);
-
-    if (this.isPristine && changeset.isPristine) {
-      return this;
-    }
-
-    let c1: Changes = this[CHANGES];
-    let c2: Changes = changeset[CHANGES];
-    let e1: Errors<any> = this[ERRORS];
-    let e2: Errors<any> = changeset[ERRORS];
-
-    // eslint-disable-next-line @typescript-eslint/no-use-before-define
-    let newChangeset: any = new ValidatedChangeset(content, this[VALIDATOR]); // ChangesetDef
-    let newErrors: Errors<any> = objectWithout(keys(c2), e1);
-    let newChanges: Changes = objectWithout(keys(e2), c1);
-    let mergedErrors: Errors<any> = mergeNested(newErrors, e2);
-    let mergedChanges: Changes = mergeNested(newChanges, c2);
-
-    newChangeset[ERRORS] = mergedErrors;
-    newChangeset[CHANGES] = mergedChanges;
-    newChangeset._notifyVirtualProperties();
-    return newChangeset;
-  }
-
-  /**
-   * Returns the changeset to its pristine state, and discards changes and
-   * errors.
-   *
-   * @method rollback
-   */
-  rollback(): this {
-    // Get keys before reset.
-    let keys = this._rollbackKeys();
-
-    // Reset.
-    this[CHANGES] = {};
-    this[ERRORS] = {};
-    this[ERRORS_CACHE] = {};
-    this._notifyVirtualProperties(keys);
-
-    this.trigger(AFTER_ROLLBACK_EVENT);
-    return this;
-  }
-
-  /**
-   * Discards any errors, keeping only valid changes.
-   *
-   * @public
-   * @chainable
-   * @method rollbackInvalid
-   * @param {String} key optional key to rollback invalid values
-   * @return {Changeset}
-   */
-  rollbackInvalid(key: string | void): this {
-    let errorKeys = keys(this[ERRORS]);
-
-    if (key) {
-      this._notifyVirtualProperties([key]);
-      // @tracked
-      this[ERRORS] = this._deleteKey(ERRORS, key) as Errors<any>;
-      this[ERRORS_CACHE] = this[ERRORS];
-      if (errorKeys.indexOf(key) > -1) {
-        this[CHANGES] = this._deleteKey(CHANGES, key) as Changes;
-      }
-    } else {
-      this._notifyVirtualProperties();
-      this[ERRORS] = {};
-      this[ERRORS_CACHE] = this[ERRORS];
-
-      // if on CHANGES hash, rollback those as well
-      errorKeys.forEach(errKey => {
-        this[CHANGES] = this._deleteKey(CHANGES, errKey) as Changes;
-      });
-    }
-
-    return this;
-  }
-
-  /**
-   * Discards changes/errors for the specified properly only.
-   *
-   * @public
-   * @chainable
-   * @method rollbackProperty
-   * @param {String} key key to delete off of changes and errors
-   * @return {Changeset}
-   */
-  rollbackProperty(key: string): this {
-    // @tracked
-    this[CHANGES] = this._deleteKey(CHANGES, key) as Changes;
-    // @tracked
-    this[ERRORS] = this._deleteKey(ERRORS, key) as Errors<any>;
-    this[ERRORS_CACHE] = this[ERRORS];
-
-    return this;
-  }
-
-  /**
-   * Validates the changeset immediately against the validationMap passed in.
-   * If no key is passed into this method, it will validate all fields on the
-   * validationMap and set errors accordingly. Will throw an error if no
-   * validationMap is present.
-   *
-   * @method validate
-   */
-  async validate(...validationKeys: string[]): Promise<any> {
-    if (keys(this.validationMap as object).length === 0 && !validationKeys.length) {
-      return Promise.resolve(null);
-    }
-
-    validationKeys =
-      validationKeys.length > 0
-        ? validationKeys
-        : keys(flattenValidations(this.validationMap as object));
-
-    let maybePromise = validationKeys.map(key => {
-      const value: any = this[key];
-      const resolvedValue = value instanceof ObjectTreeNode ? value.unwrap() : value;
-      return this._validateKey(key, resolvedValue);
-    });
-
-    return Promise.all(maybePromise);
-  }
-
-  /**
-   * Manually add an error to the changeset. If there is an existing
-   * error or change for `key`, it will be overwritten.
-   *
-   * @method addError
-   */
-  addError<T>(key: string, error: IErr<T> | ValidationErr) {
-    // Construct new `Err` instance.
-    let newError;
-
-    const isIErr = <T>(error: unknown): error is IErr<T> =>
-      this.isObject(error) && !Array.isArray(error);
-    if (isIErr(error)) {
-      assert('Error must have value.', error.hasOwnProperty('value') || error.value !== undefined);
-      assert('Error must have validation.', error.hasOwnProperty('validation'));
-      newError = new Err(error.value, error.validation);
-    } else {
-      let value = this[key];
-      newError = new Err(value, error as ValidationErr);
-    }
-
-    // Add `key` to errors map.
-    let errors: Errors<any> = this[ERRORS];
-    // @tracked
-    this[ERRORS] = this.setDeep(errors, key, newError, { safeSet: this.safeSet });
-    this[ERRORS_CACHE] = this[ERRORS];
-
-    // Return passed-in `error`.
-    return error;
-  }
-
-  /**
-   * Manually push multiple errors to the changeset as an array.
-   * key maybe in form 'name.short' so need to go deep
-   *
-   * @method pushErrors
-   */
-  pushErrors(key: string, ...newErrors: string[] | ValidationErr[]): IErr<any> {
-    let errors: Errors<any> = this[ERRORS];
-    let existingError: IErr<any> | Err = this.getDeep(errors, key) || new Err(null, []);
-    let validation: ValidationErr | ValidationErr[] = existingError.validation;
-    let value: any = this[key];
-
-    if (!Array.isArray(validation) && Boolean(validation)) {
-      existingError.validation = [validation];
-    }
-
-    let v = existingError.validation;
-    validation = [...v, ...newErrors];
-    let newError = new Err(value, validation);
-    // @tracked
-    this[ERRORS] = this.setDeep(errors, key as string, newError, { safeSet: this.safeSet });
-    this[ERRORS_CACHE] = this[ERRORS];
-
-    return { value, validation };
-  }
-
-  /**
-   * Creates a snapshot of the changeset's errors and changes.
-   *
-   * @method snapshot
-   */
-  snapshot(): Snapshot {
-    let changes: Changes = this[CHANGES];
-    let errors: Errors<any> = this[ERRORS];
-
-    return {
-      changes: keys(changes).reduce((newObj: Changes, key: keyof Changes) => {
-        newObj[key] = getChangeValue(changes[key]);
-        return newObj;
-      }, {}),
-
-      errors: keys(errors).reduce((newObj: Errors<any>, key: keyof Errors<any>) => {
-        let e = errors[key];
-        newObj[key] = { value: e.value, validation: e.validation };
-        return newObj;
-      }, {})
-    };
-  }
-
-  /**
-   * Restores a snapshot of changes and errors. This overrides existing
-   * changes and errors.
-   *
-   * @method restore
-   */
-  restore({ changes, errors }: Snapshot): this {
-    let newChanges: Changes = keys(changes).reduce((newObj: Changes, key: keyof Changes) => {
-      newObj[key] = new Change(changes[key]);
-      return newObj;
-    }, {});
-
-    let newErrors: Errors<any> = keys(errors).reduce((newObj: Errors<any>, key: keyof Changes) => {
-      let e: IErr<any> = errors[key];
-      newObj[key] = new Err(e.value, e.validation);
-      return newObj;
-    }, {});
-
-    // @tracked
-    this[CHANGES] = newChanges;
-    // @tracked
-    this[ERRORS] = newErrors;
-    this[ERRORS_CACHE] = this[ERRORS];
-
-    this._notifyVirtualProperties();
-    return this;
-  }
-
-  /**
-   * Unlike `Ecto.Changeset.cast`, `cast` will take allowed keys and
-   * remove unwanted keys off of the changeset. For example, this method
-   * can be used to only allow specified changes through prior to saving.
-   *
-   * @method cast
-   */
-  cast(allowed: string[] = []): this {
-    let changes: Changes = this[CHANGES];
-
-    if (Array.isArray(allowed) && allowed.length === 0) {
-      return this;
-    }
-
-    let changeKeys: string[] = keys(changes);
-    let validKeys = changeKeys.filter((key: string) => allowed.includes(key));
-    let casted = take(changes, validKeys);
-    // @tracked
-    this[CHANGES] = casted;
-    return this;
-  }
-
-  /**
-   * Checks to see if async validator for a given key has not resolved.
-   * If no key is provided it will check to see if any async validator is running.
-   *
-   * @method isValidating
-   */
-  isValidating(key?: string | void): boolean {
-    let runningValidations: RunningValidations = this[RUNNING_VALIDATIONS];
-    let ks: string[] = keys(runningValidations);
-    if (key) {
-      return ks.includes(key);
-    }
-    return ks.length > 0;
-  }
-
-  /**
-   * Validates a specific key
-   *
-   * @method _validateKey
-   * @private
-   */
-  _validateKey<T>(
-    key: string,
-    value: T
-  ): Promise<ValidationResult | T | IErr<T>> | T | IErr<T> | ValidationResult {
-    let content: Content = this[CONTENT];
-    let oldValue: any = this.getDeep(content, key);
-    let validation: ValidationResult | Promise<ValidationResult> = this._validate(
-      key,
-      value,
-      oldValue
-    );
-
-    this.trigger(BEFORE_VALIDATION_EVENT, key);
-
-    // TODO: Address case when Promise is rejected.
-    if (isPromise(validation)) {
-      this._setIsValidating(key, validation as Promise<ValidationResult>);
-
-      let running: RunningValidations = this[RUNNING_VALIDATIONS];
-      let promises = Object.entries(running);
-
-      return Promise.all(promises).then(() => {
-        return (validation as Promise<ValidationResult>)
-          .then((resolvedValidation: ValidationResult) => {
-            delete running[key];
-
-            return this._handleValidation(resolvedValidation, { key, value });
-          })
-          .then(result => {
-            this.trigger(AFTER_VALIDATION_EVENT, key);
-            return result;
-          });
-      });
-    }
-
-    let result = this._handleValidation(validation as ValidationResult, { key, value });
-
-    this.trigger(AFTER_VALIDATION_EVENT, key);
-
-    return result;
-  }
-
-  /**
-   * Takes resolved validation and adds an error or simply returns the value
-   *
-   * @method _handleValidation
-   * @private
-   */
-  _handleValidation<T>(
-    validation: ValidationResult,
-    { key, value }: NewProperty<T>
-  ): T | IErr<T> | ValidationErr {
-    const isValid: boolean =
-      validation === true ||
-      (Array.isArray(validation) && validation.length === 1 && validation[0] === true);
-
-    // Happy path: remove `key` from error map.
-    // @tracked
-    // ERRORS_CACHE to avoid backtracking Ember assertion.
-    this[ERRORS] = this._deleteKey(ERRORS_CACHE, key) as Errors<any>;
-
-    // Error case.
-    if (!isValid) {
-      return this.addError(key, { value, validation } as IErr<T>);
-    }
-
-    return value;
-  }
-
-  /**
-   * runs the validator with the key and value
-   *
-   * @method _validate
-   * @private
-   */
-  _validate(
-    key: string,
-    newValue: unknown,
-    oldValue: unknown
-  ): ValidationResult | Promise<ValidationResult> {
-    let validator: ValidatorAction = this[VALIDATOR];
-    let content: Content = this[CONTENT];
-
-    if (typeof validator === 'function') {
-      let validationResult = validator({
-        key,
-        newValue,
-        oldValue,
-        changes: this.change,
-        content
-      });
-
-      if (validationResult === undefined) {
-        // no validator function found for key
-        return true;
-      }
-
-      return validationResult;
-    }
-
-    return true;
-  }
-
-  /**
-   * Sets property on the changeset.
-   */
-  _setProperty<T>({ key, value, oldValue }: NewProperty<T>): void {
-    let changes: Changes = this[CHANGES];
-
-    // Happy path: update change map.
-    if (!isEqual(value, oldValue) || oldValue === undefined) {
-      // @tracked
-      let result: Changes = this.setDeep(changes, key, new Change(value), {
-        safeSet: this.safeSet
-      });
-
-      this[CHANGES] = result;
-    } else if (keyInObject(changes, key)) {
-      // @tracked
-      // remove key if setting back to original
-      this[CHANGES] = this._deleteKey(CHANGES, key) as Changes;
-    }
-  }
-
-  /**
-   * Increment or decrement the number of running validations for a
-   * given key.
-   */
-  _setIsValidating(key: string, promise: Promise<ValidationResult>): void {
-    let running: RunningValidations = this[RUNNING_VALIDATIONS];
-    this.setDeep(running, key, promise);
-  }
-
-  /**
-   * Notifies virtual properties set on the changeset of a change.
-   * You can specify which keys are notified by passing in an array.
-   *
-   * @private
-   * @param {Array} keys
-   * @return {Void}
-   */
-  _notifyVirtualProperties(keys?: string[]): string[] | undefined {
-    if (!keys) {
-      keys = this._rollbackKeys();
-    }
-
-    return keys;
-  }
-
-  /**
-   * Gets the changes and error keys.
-   */
-  _rollbackKeys(): string[] {
-    let changes: Changes = this[CHANGES];
-    let errors: Errors<any> = this[ERRORS];
-    return [...new Set([...keys(changes), ...keys(errors)])];
-  }
-
-  /**
-   * Deletes a key off an object and notifies observers.
-   */
-  _deleteKey(objName: string, key = ''): InternalMap {
-    let obj = this[objName] as InternalMap;
-    let keys = key.split('.');
-
-    if (keys.length === 1 && obj.hasOwnProperty(key)) {
-      delete obj[key];
-    } else if (obj[keys[0]]) {
-      let [base, ...remaining] = keys;
-      let previousNode: { [key: string]: any } = obj;
-      let currentNode: any = obj[base];
-      let currentKey: string | undefined = base;
-
-      // find leaf and delete from map
-      while (this.isObject(currentNode) && currentKey) {
-        let curr: { [key: string]: unknown } = currentNode;
-        if (isChange(curr) || typeof curr.value !== 'undefined' || curr.validation) {
-          delete previousNode[currentKey];
-        }
-
-        currentKey = remaining.shift();
-        previousNode = currentNode;
-        if (currentKey) {
-          currentNode = currentNode[currentKey];
-        }
-      }
-    }
-
-    return obj;
-  }
-
-  get(key: string): any {
-    // 'person'
-    // 'person.username'
-    let [baseKey, ...remaining] = key.split('.');
-    let changes: Changes = this[CHANGES];
-    let content: Content = this[CONTENT];
-    if (Object.prototype.hasOwnProperty.call(changes, baseKey)) {
-      const changesValue = this.getDeep(changes, key);
-      const isObject = this.isObject(changesValue);
-
-      if (!isObject && changesValue !== undefined) {
-        // if safeGet returns a primitive, then go ahead return
-        return changesValue;
-      }
-    }
-    // At this point, we may have a changes object, a dot separated key, or a need to access the `key`
-    // on `this` or `content`
-    if (Object.prototype.hasOwnProperty.call(changes, baseKey) && hasChanges(changes)) {
-      let baseChanges = changes[baseKey];
-
-      // 'user.name'
-      const normalizedBaseChanges = normalizeObject(baseChanges);
-      if (this.isObject(normalizedBaseChanges)) {
-        const result = this.maybeUnwrapProxy(
-          this.getDeep(normalizedBaseChanges, remaining.join('.'))
-        );
-
-        // need to do this inside of Change object
-        // basically anything inside of a Change object that is undefined means it was removed
-        if (
-          typeof result === 'undefined' &&
-          pathInChanges(changes, key, this.safeGet) &&
-          !hasKey(changes, key, this.safeGet) &&
-          this.getDeep(content, key)
-        ) {
-          return;
-        }
-
-        if (this.isObject(result)) {
-          if (isChange(result)) {
-            return getChangeValue(result);
-          }
-
-          const baseContent = this.safeGet(content, baseKey) || {};
-          const subContent = this.getDeep(baseContent, remaining.join('.'));
-          const subChanges = getSubObject(changes, key);
-          // give back an object that can further retrieve changes and/or content
-          const tree = new ObjectTreeNode(subChanges, subContent, this.getDeep, this.isObject);
-          return tree.proxy;
-        } else if (typeof result !== 'undefined') {
-          return result;
-        }
-      }
-
-      // this comes after the isObject check to ensure we don't lose remaining keys
-      if (isChange(baseChanges) && remaining.length === 0) {
-        return getChangeValue(baseChanges);
-      }
-    }
-
-    // return getters/setters/methods on BufferedProxy instance
-    if (baseKey in this || key in this) {
-      return this.getDeep(this, key);
-    }
-
-    const subContent = this.maybeUnwrapProxy(this.getDeep(content, key));
-    if (this.isObject(subContent)) {
-      let subChanges = this.getDeep(changes, key);
-      if (!subChanges) {
-        // if no changes, we need to add the path to the existing changes (mutate)
-        // so further access to nested keys works
-        subChanges = this.getDeep(this.setDeep(changes, key, {}), key);
-      }
-
-      // may still access a value on the changes or content objects
-      const tree = new ObjectTreeNode(subChanges, subContent, this.getDeep, this.isObject);
-      return tree.proxy;
-    } else if (Array.isArray(subContent)) {
-      let subChanges = this.getDeep(changes, key);
-      if (!subChanges) {
-        // return array of contents. Dont need to worry about further access sibling keys in array case
-        return subContent;
-      }
-
-      if (isObject(subChanges)) {
-        if (isObject(subContent)) {
-          subChanges = normalizeObject(subChanges, this.isObject);
-          return { ...subContent, ...subChanges };
-        } else if (Array.isArray(subContent)) {
-          subChanges = normalizeObject(subChanges, this.isObject);
-
-          return objectToArray(mergeDeep(arrayToObject(subContent), subChanges));
-        }
-      }
-
-      return subChanges;
-    }
-
-    return subContent;
-  }
-
-  set<T>(key: string, value: T): void {
-    if (this.hasOwnProperty(key) || keyInObject(this, key)) {
-      this[key] = value;
-    } else {
-      this.setUnknownProperty(key, value);
-    }
-  }
-}
-
 /**
  * Creates new changesets.
  */
-export function changeset(
-  obj: object,
+export function changeset<T extends TContent>(
+  obj: T,
   validateFn?: ValidatorAction,
   validationMap?: ValidatorMap | null | undefined,
   options?: Config
-): BufferedChangeset {
-  return new BufferedChangeset(obj, validateFn, validationMap, options);
-}
-
-type T20 = InstanceType<typeof BufferedChangeset>;
-
-export class ValidatedChangeset {
-  /**
-   * Changeset factory class if you need to extend
-   *
-   * @class ValidatedChangeset
-   * @constructor
-   */
-  constructor(
-    obj: object,
-    validateFn?: ValidatorAction,
-    validationMap?: ValidatorMap | null | undefined,
-    options?: Config
-  ) {
-    const c: BufferedChangeset = changeset(obj, validateFn, validationMap, options);
-
-    return new Proxy(c, {
-      get(targetBuffer, key /*, receiver*/) {
-        const res = targetBuffer.get(key.toString());
-        return res;
-      },
-
-      set(targetBuffer, key, value /*, receiver*/) {
-        targetBuffer.set(key.toString(), value);
-        return true;
-      }
-    }) as T20;
-  }
+): IChangeset<T> {
+  return new Changeset<T>(obj, validateFn, validationMap, options);
 }
 
-export function Changeset(
-  obj: object,
-  validateFn?: ValidatorAction,
-  validationMap?: ValidatorMap | null | undefined,
-  options?: Config
-): BufferedChangeset {
-  const c: BufferedChangeset = changeset(obj, validateFn, validationMap, options);
-
-  return new Proxy(c, {
-    get(targetBuffer, key /*, receiver*/) {
-      const res = targetBuffer.get(key.toString());
-      return res;
-    },
-
-    set(targetBuffer, key, value /*, receiver*/) {
-      targetBuffer.set(key.toString(), value);
-      return true;
-    }
-  });
-}
-
-// determine if two values are equal
-function isEqual(v1: unknown, v2: unknown) {
-  if (v1 instanceof Date && v2 instanceof Date) {
-    return v1.getTime() === v2.getTime();
-  }
-
-  return v1 === v2;
-}
+export { Changeset };
diff --git a/src/types/index.ts b/src/types/index.ts
index fe761fe..7df0745 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -68,14 +68,13 @@ export interface Changes {
   [s: string]: any; //IChange;
 }
 
-export interface Content {
-  save?: Function | undefined;
-  [key: string]: any;
-}
+export type TContentObject = { [key: string]: any }; //Record<string, any>;
+export type TContentArray = any[];
+export type TContent = TContentObject | TContentArray;
 
 export interface IErr<T> {
   value: T;
-  validation: ValidationErr | ValidationErr[];
+  validation: ValidationErr[];
 }
 
 export type Errors<T> = {
@@ -109,63 +108,35 @@ export type Snapshot = {
 
 export type PrepareChangesFn = (obj: { [s: string]: any }) => { [s: string]: any } | null;
 
-export interface ChangesetDef {
-  __changeset__: string;
-
-  _content: object;
-  _changes: Changes;
-  _errors: Errors<any>;
-  _validator: ValidatorAction;
-  _options: Config;
-  _runningValidations: RunningValidations;
-  _bareChanges: { [s: string]: any };
+export interface ChangeRecord {
+  key: string;
+  value: any;
+}
 
-  changes: Record<string, any>[];
+export interface IChangeset<T extends TContent> {
+  changes: ChangeRecord[];
   errors: PublicErrors;
-  error: object;
-  change: object;
-  data: object;
+  error: Record<string, any>;
+  change: Record<string, any>;
+
+  content: T;
+  originalContent: T;
 
   isValid: boolean;
   isPristine: boolean;
   isInvalid: boolean;
   isDirty: boolean;
 
-  get: (key: string) => any;
-  set: <T>(
-    key: string,
-    value: T
-  ) => void | T | IErr<T> | Promise<T> | Promise<ValidationResult | T | IErr<T>> | ValidationResult;
-  maybeUnwrapProxy: Function;
-  getDeep: any;
-  setDeep: any;
-  safeGet: (obj: any, key: string) => any;
   prepare(preparedChangedFn: PrepareChangesFn): this;
-  execute: () => this;
-  save: (options: object) => Promise<ChangesetDef | any>;
-  merge: (changeset: this) => this;
-  rollback: () => this;
-  rollbackInvalid: (key: string | void) => this;
-  rollbackProperty: (key: string) => this;
-  validate: (
-    key: string
-  ) => Promise<null> | Promise<any | IErr<any>> | Promise<Array<any | IErr<any>>>;
-  addError: <T>(key: string, error: IErr<T> | ValidationErr) => IErr<T> | ValidationErr;
-  pushErrors: (key: string, newErrors: string[]) => IErr<any>;
-  snapshot: () => Snapshot;
-  restore: (obj: Snapshot) => this;
-  cast: (allowed: Array<string>) => this;
-  isValidating: (key: string | void) => boolean;
-  _validate: (
-    key: string,
-    newValue: any,
-    oldValue: any
-  ) => ValidationResult | Promise<ValidationResult>;
-  _setProperty: <T>(obj: NewProperty<T>) => void;
-  _setIsValidating: (key: string, value: Promise<ValidationResult>) => void;
-  _notifyVirtualProperties: (keys?: string[]) => string[] | undefined;
-  _rollbackKeys: () => Array<string>;
-  _deleteKey: (objName: InternalMapKey, key: string) => InternalMap;
+  execute(): this;
+  unexecute(): this;
+  merge(changeset2: IChangeset<T>): IChangeset<T>;
+  rollback(): this;
+  rollbackInvalid(key?: string): this;
+  applyTo(target: T, options?: object): this;
+  validate(...keys: string[]): Promise<null | any | IErr<any> | Array<any | IErr<any>>>;
+  pushErrors(key: string, ...newErrors: (IErr<T> | ValidationErr)[]): IErr<any>;
+  snapshot(): Snapshot;
+  restore(obj: Snapshot): this;
+  isValidating(key?: string): boolean;
 }
-
-export interface IChangeset extends ChangesetDef, IEvented {}
diff --git a/src/utils/build-old-values.ts b/src/utils/build-old-values.ts
index 30ffc08..41b3da7 100644
--- a/src/utils/build-old-values.ts
+++ b/src/utils/build-old-values.ts
@@ -1,8 +1,6 @@
-export function buildOldValues(
-  content: any,
-  changes: Record<string, any>[],
-  getDeep: Function
-): object {
+import getDeep from '../-private/utils/get-deep';
+
+export function buildOldValues(content: any, changes: Record<string, any>[]): object {
   const obj = Object.create(null);
 
   for (let change of changes) {
diff --git a/src/utils/flatten-validations.ts b/src/utils/flatten-validations.ts
index 85115f0..6b6ff26 100644
--- a/src/utils/flatten-validations.ts
+++ b/src/utils/flatten-validations.ts
@@ -1,4 +1,4 @@
-import isObject from './is-object';
+import isObject from '../-private/utils/is-object';
 
 function flatten(
   validatorMap: Record<string, any>,
diff --git a/src/utils/get-key-values.ts b/src/utils/get-key-values.ts
index b921e25..05b4d4d 100644
--- a/src/utils/get-key-values.ts
+++ b/src/utils/get-key-values.ts
@@ -1,5 +1,5 @@
 import { getChangeValue, isChange } from '../-private/change';
-import isObject from './is-object';
+import isObject from '../-private/utils/is-object';
 import Err from '../-private/err';
 import { PublicErrors } from '../types';
 
diff --git a/src/utils/has-changes.ts b/src/utils/has-changes.ts
index 65a6fa3..0ac6647 100644
--- a/src/utils/has-changes.ts
+++ b/src/utils/has-changes.ts
@@ -1,4 +1,4 @@
-import isObject from './is-object';
+import isObject from '../-private/utils/is-object';
 import { isChange } from '../-private/change';
 
 export function hasChanges(changes: Record<string, any>): boolean {
diff --git a/src/utils/index.ts b/src/utils/index.ts
deleted file mode 100644
index e02c820..0000000
--- a/src/utils/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export { default as pureAssign } from './assign';
-export { default as getDeep } from './get-deep';
-export { default as setDeep } from './set-deep';
-export { getKeyValues, getKeyErrorValues } from './get-key-values';
-export { default as handleMultipleValidations } from './handle-multiple-validations';
-export { default as isChangeset } from './is-changeset';
-export { default as isObject } from './is-object';
-export { default as isPromise } from './is-promise';
-export { default as mergeDeep } from './merge-deep';
-export { default as mergeNested } from './merge-nested';
-export { default as normalizeObject } from './normalize-object';
-export { default as objectWithout } from './object-without';
-export { default as take } from './take';
-export { default as validatorLookup } from './validator-lookup';
-export { default as wrap } from './wrap';
diff --git a/src/utils/is-changeset.ts b/src/utils/is-changeset.ts
deleted file mode 100644
index 860897c..0000000
--- a/src/utils/is-changeset.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const CHANGESET = '__CHANGESET__';
-
-export default function isChangeset(changeset: any): boolean {
-  return changeset && changeset['__changeset__'] === CHANGESET;
-}
diff --git a/src/utils/is-promise.ts b/src/utils/is-promise.ts
index 00ce768..96d893a 100644
--- a/src/utils/is-promise.ts
+++ b/src/utils/is-promise.ts
@@ -1,4 +1,4 @@
-import isObject from './is-object';
+import isObject from '../-private/utils/is-object';
 
 function isPromiseLike(obj: any): boolean {
   return (
diff --git a/src/utils/merge-nested.ts b/src/utils/merge-nested.ts
index d66d5ad..b39296f 100644
--- a/src/utils/merge-nested.ts
+++ b/src/utils/merge-nested.ts
@@ -1,4 +1,4 @@
-import setDeep from './set-deep';
+import setDeep from '../-private/utils/set-deep';
 
 const { keys } = Object;
 
diff --git a/src/utils/normalize-object.ts b/src/utils/normalize-object.ts
index 03114f9..3210fad 100644
--- a/src/utils/normalize-object.ts
+++ b/src/utils/normalize-object.ts
@@ -1,5 +1,5 @@
 import { getChangeValue, isChange } from '../-private/change';
-import isObject from './is-object';
+import isObject from '../-private/utils/is-object';
 
 /**
  * traverse through target and unset `value` from leaf key so can access normally
diff --git a/src/utils/object-tree-node.ts b/src/utils/object-tree-node.ts
index 03ffb50..1a475d6 100644
--- a/src/utils/object-tree-node.ts
+++ b/src/utils/object-tree-node.ts
@@ -1,6 +1,6 @@
 import { ProxyHandler, Content } from '../types';
-import isObjectFn from './is-object';
-import setDeep from './set-deep';
+import isObjectFn from '../-private/utils/is-object';
+import setDeep from '../-private/utils/set-deep';
 import Change, { getChangeValue, isChange } from '../-private/change';
 import normalizeObject from './normalize-object';
 import { objectToArray, arrayToObject } from './array-object';
diff --git a/src/utils/validator-lookup.ts b/src/utils/validator-lookup.ts
index a06667b..abc4dbb 100644
--- a/src/utils/validator-lookup.ts
+++ b/src/utils/validator-lookup.ts
@@ -1,6 +1,6 @@
 import handleMultipleValidations from './handle-multiple-validations';
 import isPromise from './is-promise';
-import isObject from './is-object';
+import isObject from '../-private/utils/is-object';
 import {
   ValidatorAction,
   ValidatorMapFunc,
@@ -8,7 +8,7 @@ import {
   ValidationResult,
   ValidatorMap
 } from '../types';
-import get from './get-deep';
+import getDeep from '../-private/utils/get-deep';
 
 /**
  * returns a closure to lookup and validate k/v pairs set on a changeset
@@ -24,7 +24,7 @@ export default function lookupValidator(validationMap: ValidatorMap): ValidatorA
       | ValidatorMapFunc[]
       | ValidatorClass
       | ValidatorClass[]
-      | Array<ValidatorMapFunc | ValidatorClass> = get(validations, key);
+      | Array<ValidatorMapFunc | ValidatorClass> = getDeep(validations, key);
     const isValidatorClass = (maybeClass: unknown): maybeClass is ValidatorClass =>
       !!(maybeClass as Record<string, any>).validate;
     if (validator && isValidatorClass(validator)) {
diff --git a/structure.drawio.svg b/structure.drawio.svg
new file mode 100644
index 0000000..8acddc0
--- /dev/null
+++ b/structure.drawio.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Do not edit this file with editors other than diagrams.net -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="938px" height="439px" viewBox="-0.5 -0.5 938 439" content="&lt;mxfile host=&quot;app.diagrams.net&quot; modified=&quot;2021-12-22T03:53:04.891Z&quot; agent=&quot;5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36&quot; etag=&quot;1fjb5F1BUyh2mdqkb9Tf&quot; version=&quot;16.0.2&quot; type=&quot;github&quot;&gt;&lt;diagram id=&quot;Is3N_EmxeOObmxaKkfsm&quot; name=&quot;Page-1&quot;&gt;7Vvfc5s4EP5rPHP3EA8Sv8xj6jpNZ66X3HnurukbMbIhJRYDcmznr68AYZCEbZlgTHP1Q4LWkkC73+5qP+SBPn7efIrdyP+CPRQOoOZtBvrHAaQfw6H/Usk2l9jAzAWLOPByESgF0+AVMaHGpKvAQwnXkWAckiDihTO8XKIZ4WRuHOM1322OQ/6ukbtAkmA6c0NZ+l/gET+XjqBdym9RsPCLOwOLLfjZLTqzlSS+6+F1RaRPBvo4xpjkV8+bMQpT5RV6ycfd7Pl292AxWhKVAfdTC34z79bJ9M/bwJ+MyPcvr1dslhc3XLEF38d4E1CNQyuk0354jOnVIr2a+QHVnSSOYhyhmGzZIsm20BxaetepAWhrFrpJEsxob588h1QA6GWMV0sPpQ+n0RZdRLz9mjaGtlm0H6pfftxwrW3R2gTkK5syvX6ozEGb5ai0UQzKHxZ5ku1LZTJRglfxjPWCd//8O5+Aq8nm6fob+fuz9/oXuGJAIG68QORAvxz3zDSfEH5GdBV0IPMUbQiAaeRzrUugmQw8fgVjhSxGoUuCF34JLsP7YneH3U3vcUAXt7ujbrB5mGfqjsZPkS+djaoCS5zIESYyhIly3UgTUXS420q3KO2Q7H9gc8TfBzhmdTp6kc8ojC6mx/N5gogwomKKUpQ5Tr0T1ZtWciLmK6JHULxNWRPHxMcLvHTDSSkVfKLs8wfGEcP4EyJky+KkuyKYd6rCGyoe8FD5qt4bKr4HT/K95l4DFb1Gr/VU2YuUfYGz/amGhpKh7+JgEVADUSl+fEoTkGh03qRrPyBoGrmZctY0ZfLmS0iMv6MxDnGcjdZvbjT6od/MgzDk5GP6OWSCFxqU0eag0ti3VwAIjlVEmEogArAmElnamRStS4oe5x51Hi1rmuPUadlxbm4cpyUtm7yS4cWVbPQvbPFJ/HAOr0Qtc6RXw9aVNtR0/Ujsylr3KA6oMlH85oBmKgY0q1cBzXyXAc3S++Zq1vuLZ7Zmc0o2oXlhJduSktNaRi5MTtNtUbUdRnMLCjX0vmXh0T6Farfu0gtRLFeDCcFxWjxqM99dLrIrGuspzHdh5ec0xuVDiCMZQ07UDStubss/NI8lzga5unleHSnmVVMxr3ZTW5tt1dZmw9q6tdJWOx/sho14nhJqxwvb5rBTZXVGvYIdFGoMw2wIO7qD4CfSOoZdDaWClwQt5Z3SxaoTqFqe8OEVHouvzUELVFkVWxG13RQhxWNzu+Ns94DeujHubL8A7L5t3oDMocwKrf4Wpfu439uK5IBHuK26g9A4f1Ki7M/K0MNeBXOJVm+6hzDEzUjXewijP0G7Wcw+Y8i2FMHZL94IyMRRQWi0UXPLfIZlZZGaC+gthG1D8DHj4iQGkKmixkV3PZ37k5ji8nwSkAmltjJmr2sfoMplA9Wg1FHCFF5j2QWCTq5+LH4iyxYmOnfClIm3X9XPcdg6qrBV5Yo6yqUys1fk0rbKoM6COBR5g4sHcSgTWP/TMkg9rDu9CuuGQGpZVsOwbgrgtEC3YR3KpFZ7+4nTDu40OibUHHqqJL5yZO4GeUA4cGaKLKgq8qDwNkniZc+NPJlh2x3z1OarbILr+8/tobGFE5yHw2BNSmNknucmfvZIB1Naa6SRKmKLU0DaUKcfKSl2ySOJubYxjwTUUHzqOU9LeODCDS9+zhPKlOp53ahZUO+VHynvOlRrycs5kgXFKN5wI2Jbe6iOlh3J1u3aB768I8lHD4uSJ2JkV5D6VOi+BmG2Yi/1D6jhJf2T4ig9UZLCL7+cD8oTJsN61otWOlF6OXPDEK/I8aIpqhwNZIMqpwWPvFraFVhnPIAlnTEwamotvcYdRmertfazwrOykj1k2sz6QzfZX/i+PzuK79p7YEeZg/6wjWjiKv1TpKDnmTtGq8eQJrc2siCXfvZnqSbM6AXe8kDFJNiv4yTSzrHpcRJp59jxcRIoM/m/AN0N19qvVwRQQPTux5lvRTQUX843RjRtlr8JzbuXv6zVJz8A&lt;/diagram&gt;&lt;/mxfile&gt;" resource="https://app.diagrams.net/?src=about#HBryanCrotaz%2Fvalidated-changeset%2Fuse-proxy-incompatible%2Fstructure.drawio.svg"><defs/><g><path d="M 660 45 L 690 45 L 690 268.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 690 273.88 L 686.5 266.88 L 690 268.63 L 693.5 266.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 160px; margin-left: 690px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Proxies<br />child<br />property</div></div></div></foreignObject><text x="690" y="163" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">Proxies...</text></switch></g><path d="M 90 60 L 90 93.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 90 98.88 L 86.5 91.88 L 90 93.63 L 93.5 91.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 80px; margin-left: 90px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">child</div></div></div></foreignObject><text x="90" y="83" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">child</text></switch></g><rect x="0" y="0" width="120" height="60" fill="#ffcccc" stroke="#ff0000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 30px; margin-left: 1px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Original object</div></div></div></foreignObject><text x="60" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Original object</text></switch></g><rect x="60" y="100" width="120" height="60" fill="#99ff99" stroke="#009900" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 130px; margin-left: 61px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Child object</div></div></div></foreignObject><text x="120" y="134" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Child object</text></switch></g><path d="M 860 130 L 887 130 L 886.96 366.65" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 886.96 371.9 L 883.46 364.9 L 886.96 366.65 L 890.46 364.9 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 238px; margin-left: 887px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">child</div></div></div></foreignObject><text x="887" y="241" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">child</text></switch></g><rect x="740" y="100" width="120" height="60" fill="#ffcccc" stroke="#ff0000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 130px; margin-left: 741px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Original object</div></div></div></foreignObject><text x="800" y="134" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Original object</text></switch></g><rect x="817" y="375" width="120" height="60" fill="#99ff99" stroke="#009900" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 405px; margin-left: 818px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Child object</div></div></div></foreignObject><text x="877" y="409" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Child object</text></switch></g><rect x="540" y="0" width="120" height="60" fill="#000000" stroke="#000000" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><rect x="540" y="0" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#ff0000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 30px; margin-left: 541px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Proxy</div></div></div></foreignObject><text x="600" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Proxy</text></switch></g><rect x="540" y="100" width="120" height="60" fill="#000000" stroke="#000000" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><rect x="540" y="100" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#ff0000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 130px; margin-left: 541px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Proxy Handler<br />stores changes to original</div></div></div></foreignObject><text x="600" y="134" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Proxy Handler...</text></switch></g><path d="M 660 130 L 733.63 130" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 738.88 130 L 731.88 133.5 L 733.63 130 L 731.88 126.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 600 60 L 600 93.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 600 98.88 L 596.5 91.88 L 600 93.63 L 603.5 91.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 400 15 L 533.63 15" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 538.88 15 L 531.88 18.5 L 533.63 15 L 531.88 11.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 15px; margin-left: 470px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">content</div></div></div></foreignObject><text x="470" y="18" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">content</text></switch></g><rect x="280" y="0" width="120" height="60" fill="#000000" stroke="#000000" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><rect x="280" y="0" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#ff0000" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 30px; margin-left: 281px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Changeset</div></div></div></foreignObject><text x="340" y="34" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Changeset</text></switch></g><path d="M 540 45 L 406.37 45" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 401.12 45 L 408.12 41.5 L 406.37 45 L 408.12 48.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 45px; margin-left: 470px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">changeset(proxy)</div></div></div></foreignObject><text x="470" y="48" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">changeset(...</text></switch></g><path d="M 720 405 L 810.63 405" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 815.88 405 L 808.88 408.5 L 810.63 405 L 808.88 401.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><rect x="600" y="275" width="120" height="60" fill="#000000" stroke="#000000" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><rect x="600" y="275" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#006600" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 305px; margin-left: 601px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Child Proxy</div></div></div></foreignObject><text x="660" y="309" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Child Proxy</text></switch></g><rect x="600" y="375" width="120" height="60" fill="#000000" stroke="#000000" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><rect x="600" y="375" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#006600" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 405px; margin-left: 601px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Proxy Handler<br />stores changes to child</div></div></div></foreignObject><text x="660" y="409" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Proxy Handler...</text></switch></g><path d="M 660 335 L 660 368.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 660 373.88 L 656.5 366.88 L 660 368.63 L 663.5 366.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 430 290 L 593.63 290" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 598.88 290 L 591.88 293.5 L 593.63 290 L 591.88 286.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 290px; margin-left: 515px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">content</div></div></div></foreignObject><text x="515" y="293" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">content</text></switch></g><rect x="310" y="275" width="120" height="60" fill="#000000" stroke="#000000" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><rect x="310" y="275" width="120" height="60" fill="rgb(255, 255, 255)" stroke="#006600" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 305px; margin-left: 311px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Child Changeset</div></div></div></foreignObject><text x="370" y="309" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Child Changeset</text></switch></g><path d="M 600 320 L 436.37 320" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 431.12 320 L 438.12 316.5 L 436.37 320 L 438.12 323.5 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 320px; margin-left: 515px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">changeset(proxy)</div></div></div></foreignObject><text x="515" y="323" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">changeset(...</text></switch></g><path d="M 630 160 L 630 268.63" fill="none" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="stroke"/><path d="M 630 273.88 L 626.5 266.88 L 630 268.63 L 633.5 266.88 Z" fill="rgb(0, 0, 0)" stroke="rgb(0, 0, 0)" stroke-miterlimit="10" pointer-events="all"/><path d="M 660 30 L 800 30 L 800 93.63" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 800 98.88 L 796.5 91.88 L 800 93.63 L 803.5 91.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 30px; margin-left: 730px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Proxies full API</div></div></div></foreignObject><text x="730" y="33" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">Proxies fu...</text></switch></g><path d="M 720 305 L 847 305 L 847 368.63" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 847 373.88 L 843.5 366.88 L 847 368.63 L 850.5 366.88 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 305px; margin-left: 786px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Proxies full API</div></div></div></foreignObject><text x="786" y="308" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">Proxies fu...</text></switch></g><path d="M 650 195 L 780 195 L 780 245 L 735 245 L 715 275 L 715 245 L 650 245 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><path d="M 650 195 L 780 195 L 780 245 L 735 245 L 715 275 L 715 245 L 650 245 Z" fill="#99ff99" stroke="#006600" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 220px; margin-left: 651px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Child proxy is lazily added on get or set of original.child</div></div></div></foreignObject><text x="715" y="224" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Child proxy is lazily...</text></switch></g><path d="M 410 195 L 540 195 L 540 245 L 495 245 L 475 275 L 475 245 L 410 245 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all" transform="translate(2,3)" opacity="0.25"/><path d="M 410 195 L 540 195 L 540 245 L 495 245 L 475 275 L 475 245 L 410 245 Z" fill="#99ff99" stroke="#006600" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 128px; height: 1px; padding-top: 220px; margin-left: 411px;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">Child changeset is lazily added on proxy.asChangeset</div></div></div></foreignObject><text x="475" y="224" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">Child changeset is la...</text></switch></g><path d="M 340 60 L 533.99 127.9" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 538.94 129.63 L 531.18 130.62 L 533.99 127.9 L 533.49 124.01 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 95px; margin-left: 440px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Bypass proxy<br />for public API</div></div></div></foreignObject><text x="440" y="98" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">Bypass pro...</text></switch></g><path d="M 370 335 L 593.91 403.15" fill="none" stroke="#000000" stroke-miterlimit="10" stroke-dasharray="3 3" pointer-events="stroke"/><path d="M 598.93 404.67 L 591.21 405.98 L 593.91 403.15 L 593.25 399.29 Z" fill="#000000" stroke="#000000" stroke-miterlimit="10" pointer-events="all"/><g transform="translate(-0.5 -0.5)"><switch><foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;"><div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 370px; margin-left: 485px;"><div data-drawio-colors="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); " style="box-sizing: border-box; font-size: 0px; text-align: center;"><div style="display: inline-block; font-size: 11px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; background-color: rgb(255, 255, 255); white-space: nowrap;">Bypass proxy<br />for public API</div></div></div></foreignObject><text x="485" y="373" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="11px" text-anchor="middle">Bypass pro...</text></switch></g></g><switch><g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/><a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank"><text text-anchor="middle" font-size="10px" x="50%" y="100%">Viewer does not support full SVG 1.1</text></a></switch></svg>
\ No newline at end of file
diff --git a/test/access.test.ts b/test/access.test.ts
new file mode 100644
index 0000000..51d9977
--- /dev/null
+++ b/test/access.test.ts
@@ -0,0 +1,95 @@
+import { Changeset } from '../src';
+
+let dummyModel: any;
+
+/// ****************************************
+/// Test that each method of access works ok
+/// ****************************************
+describe('Unit | Utility | changeset | access', () => {
+  beforeEach(() => {
+    dummyModel = {
+      save() {
+        return Promise.resolve(this);
+      },
+      name: 'Bryan',
+      person: {
+        name: 'Steve',
+        age: 42
+      },
+      primes: [5, 7, 11]
+    };
+  });
+
+  afterEach(() => {
+    dummyModel = {};
+  });
+
+  /**
+   * #toString
+   */
+
+  it('content can be read by direct property access', () => {
+    const dummyChangeset = new Changeset(dummyModel);
+
+    expect(dummyChangeset.content.name).toEqual('Bryan');
+    expect(dummyChangeset.content.person.age).toEqual(42);
+    expect(dummyChangeset.content.primes[2]).toEqual(11);
+    expect(dummyChangeset.content.primes.length).toEqual(3);
+    let keys = Object.keys(dummyChangeset.content.person);
+    expect(keys).toContain('age');
+    expect(keys).toContain('name');
+  });
+
+  it('content can be written by direct property access', () => {
+    const dummyChangeset = new Changeset(dummyModel);
+
+    dummyChangeset.content.person.name = 'Susan';
+    expect(dummyModel.person.name).toEqual('Steve');
+    dummyChangeset.applyTo(dummyModel);
+    expect(dummyModel.person.name).toEqual('Susan');
+
+    dummyChangeset.content.primes[2] = 17;
+    expect(dummyModel.primes[2]).toEqual(11);
+    dummyChangeset.applyTo(dummyModel);
+    expect(dummyModel.primes[2]).toEqual(17);
+
+    dummyChangeset.content.primes[2]++;
+    expect(dummyModel.primes[2]).toEqual(17);
+    dummyChangeset.applyTo(dummyModel);
+    expect(dummyModel.primes[2]).toEqual(18);
+  });
+
+  it('content can be read by changeset.get', () => {
+    const dummyChangeset = new Changeset(dummyModel);
+
+    expect(dummyChangeset.content.name).toEqual('Bryan');
+    expect(dummyChangeset.content.person.age).toEqual(42);
+    expect(dummyChangeset.content.person.get('age')).toEqual(42);
+    expect(dummyChangeset.content.primes[2]).toEqual(11);
+    expect(dummyChangeset.content.primes[2]).toEqual(11);
+    expect(dummyChangeset.content.primes.length).toEqual(3);
+    expect(dummyChangeset.content.primes.length).toEqual(3);
+    let keys = Object.keys(dummyChangeset.content.person);
+    expect(keys).toContain('age');
+    expect(keys).toContain('name');
+  });
+
+  it('content can be written by changeset.set', () => {
+    const dummyChangeset = new Changeset(dummyModel);
+
+    dummyChangeset.content.person.name = 'Susan';
+    expect(dummyModel.person.name).toEqual('Steve');
+    dummyChangeset.applyTo(dummyModel);
+    expect(dummyModel.person.name).toEqual('Susan');
+
+    dummyChangeset.content.primes[2] = 17;
+    expect(dummyModel.primes[2]).toEqual(11);
+    dummyChangeset.applyTo(dummyModel);
+    expect(dummyModel.primes[2]).toEqual(17);
+
+    dummyChangeset.content.primes[2] = dummyChangeset.content.primes[2] + 1;
+    expect(dummyModel.primes[2]).toEqual(17);
+    dummyChangeset.applyTo(dummyModel);
+    expect(dummyModel.primes[2]).toEqual(18);
+  });
+});
diff --git a/test/index.test.ts b/test/index.test.ts
index f05b068..cf3628f 100644
--- a/test/index.test.ts
+++ b/test/index.test.ts
@@ -1,6 +1,5 @@
-import { Changeset } from '../src';
-import get from '../src/utils/get-deep';
-import set from '../src/utils/set-deep';
+import { Changeset, Err } from '../src';
+import getDeep from '../src/-private/utils/get-deep';
 import lookupValidator from '../src/utils/validator-lookup';
 
 let dummyModel: any;
@@ -83,7 +82,7 @@ function dummyValidator({
   changes: any;
   content: any;
 }) {
-  const validatorFn = get(dummyValidations, key);
+  const validatorFn = getDeep(dummyValidations, key);
 
   if (typeof validatorFn === 'function') {
     return validatorFn(newValue, oldValue, changes, content);
@@ -109,12 +108,10 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('content can be an empty hash', () => {
-    expect.assertions(1);
-
     const emptyObject = {};
-    const dummyChangeset = Changeset(emptyObject, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(emptyObject, lookupValidator(dummyValidations));
 
-    expect(dummyChangeset.toString()).toEqual('changeset:[object Object]');
+    expect(dummyChangeset.content.toString()).toEqual('[object Object]');
   });
 
   /**
@@ -122,45 +119,45 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#error returns the error object and keeps changes', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     const expectedResult = { name: { validation: 'too short', value: 'a' } };
-    dummyChangeset.set('name', 'a');
+    dummyChangeset.content.name = 'a';
 
-    expect(dummyChangeset.error).toEqual(expectedResult);
-    expect(dummyChangeset.error.name).toEqual(expectedResult.name);
-    expect(dummyChangeset.get('error.name')).toEqual(expectedResult.name);
-    expect(dummyChangeset.change).toEqual({ name: 'a' });
-    expect(dummyChangeset.change.name).toEqual('a');
-    expect(dummyChangeset.get('change.name')).toEqual('a');
+    expect(dummyChangeset.content.error).toEqual(expectedResult);
+    expect(dummyChangeset.content.error.name).toEqual(expectedResult.name);
+    expect(dummyChangeset.content.error.name).toEqual(expectedResult.name);
+    expect(dummyChangeset.content.change).toEqual({ name: 'a' });
+    expect(dummyChangeset.content.change.name).toEqual('a');
+    expect(dummyChangeset.content.change.name).toEqual('a');
   });
 
   it('#error can use custom validator', () => {
-    const dummyChangeset = Changeset(dummyModel, dummyValidator);
+    const dummyChangeset = new Changeset(dummyModel, dummyValidator);
     const expectedResult = { name: { validation: 'too short', value: 'a' } };
-    dummyChangeset.set('name', 'a');
+    dummyChangeset.content.name = 'a';
 
-    expect(dummyChangeset.error).toEqual(expectedResult);
-    expect(dummyChangeset.error.name).toEqual(expectedResult.name);
-    expect(dummyChangeset.get('error.name')).toEqual(expectedResult.name);
-    expect(dummyChangeset.change).toEqual({ name: 'a' });
-    expect(dummyChangeset.change.name).toEqual('a');
-    expect(dummyChangeset.get('change.name')).toEqual('a');
+    expect(dummyChangeset.content.error).toEqual(expectedResult);
+    expect(dummyChangeset.content.error.name).toEqual(expectedResult.name);
+    expect(dummyChangeset.content.error.name).toEqual(expectedResult.name);
+    expect(dummyChangeset.content.change).toEqual({ name: 'a' });
+    expect(dummyChangeset.content.change.name).toEqual('a');
+    expect(dummyChangeset.content.change.name).toEqual('a');
   });
 
   it('can get nested values in the error object', function() {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     const expectedResult = { validation: 'too short', value: 'a' };
-    dummyChangeset.set('name', 'a');
+    dummyChangeset.content.name = 'a';
 
-    expect(dummyChangeset.get('error.name')).toEqual(expectedResult);
+    expect(dummyChangeset.content.error.name).toEqual(expectedResult);
   });
 
   it('can can work with an array of nested validations', function() {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     const expectedResult = { validation: ['too short', 'not an email'], value: 'a' };
-    dummyChangeset.set('email', 'a');
+    dummyChangeset.content.email = 'a';
 
-    expect(dummyChangeset.get('error.email')).toEqual(expectedResult);
+    expect(dummyChangeset.content.error.email).toEqual(expectedResult);
   });
 
   /**
@@ -168,61 +165,61 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#change returns the changes object', () => {
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     const expectedResult = { name: 'a' };
-    dummyChangeset.set('name', 'a');
+    dummyChangeset.content.name = 'a';
 
-    expect(dummyChangeset.change).toEqual(expectedResult);
+    expect(dummyChangeset.content.change).toEqual(expectedResult);
   });
 
   it('#change supports `undefined`', () => {
     const model = { name: 'a' };
-    const dummyChangeset = Changeset(model);
+    const dummyChangeset = new Changeset(model);
     const expectedResult = { name: undefined };
-    dummyChangeset.set('name', undefined);
+    dummyChangeset.content.name = undefined;
 
-    expect(dummyChangeset.change).toEqual(expectedResult);
+    expect(dummyChangeset.content.change).toEqual(expectedResult);
   });
 
   it('#change works with arrays', () => {
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     const newArray = [...exampleArray, 'new'];
     const expectedResult = { exampleArray: newArray };
-    dummyChangeset.set('exampleArray', newArray);
+    dummyChangeset.content.exampleArray = newArray;
 
-    expect(dummyChangeset.change).toEqual(expectedResult);
+    expect(dummyChangeset.content.change).toEqual(expectedResult);
   });
 
   /**
    * #errors
    */
   it('#errors returns the error object and keeps changes', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedResult = [{ key: 'name', validation: 'too short', value: 'a' }];
-    dummyChangeset.set('name', 'a');
+    dummyChangeset.content.name = 'a';
 
-    expect(dummyChangeset.errors).toEqual(expectedResult);
-    expect(dummyChangeset.get('errors')).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
   });
 
   it('can get nested values in the errors object', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('unknown', 'wat');
-    dummyChangeset.set('org.usa.ny', '');
-    dummyChangeset.set('name', '');
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.unknown = 'wat';
+    dummyChangeset.content.org.usa.ny = '';
+    dummyChangeset.content.name = '';
 
     let expectedErrors = [
-      { key: 'org.usa.ny', validation: ['must be present', 'only letters work'], value: '' },
-      { key: 'name', validation: 'too short', value: '' }
+      { key: 'name', validation: 'too short', value: '' },
+      { key: 'org.usa.ny', validation: ['must be present', 'only letters work'], value: '' }
     ];
-    expect(dummyChangeset.get('errors')).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
 
-    dummyChangeset.set('org.usa.ny', '1');
+    dummyChangeset.content.org.usa.ny = '1';
     expectedErrors = [
-      { key: 'org.usa.ny', validation: ['only letters work'], value: '1' },
-      { key: 'name', validation: 'too short', value: '' }
+      { key: 'name', validation: 'too short', value: '' },
+      { key: 'org.usa.ny', validation: ['only letters work'], value: '1' }
     ];
-    expect(dummyChangeset.get('errors')).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
   });
 
   /**
@@ -234,9 +231,9 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('data reads the changeset CONTENT', () => {
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
 
-    expect(dummyChangeset.data).toEqual(dummyModel);
+    expect(dummyChangeset.content.content).toEqual(dummyModel);
   });
 
   /**
@@ -255,34 +252,34 @@ describe('Unit | Utility | changeset', () => {
     dummyModel.name = 'Bobby';
     dummyModel.thing = 123;
     dummyModel.nothing = null;
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'Bobby');
-    dummyChangeset.set('nothing', null);
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'Bobby';
+    dummyChangeset.content.nothing = null;
 
-    expect(dummyChangeset.get('isPristine')).toBeTruthy();
+    expect(dummyChangeset.content.isPristine).toBeTruthy();
   });
 
   it("isPristine returns false if changes are not equal to content's values", () => {
     dummyModel.name = 'Bobby';
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'Bobby');
-    dummyChangeset.set('thing', 123);
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'Bobby';
+    dummyChangeset.content.thing = 123;
 
-    expect(dummyChangeset.get('isPristine')).toBeFalsy();
+    expect(dummyChangeset.content.isPristine).toBeFalsy();
   });
 
   it('isPristine works with `null` values', () => {
     dummyModel.name = null;
     dummyModel.age = 15;
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
 
-    expect(dummyChangeset.get('isPristine')).toBeTruthy();
+    expect(dummyChangeset.content.isPristine).toBeTruthy();
 
-    dummyChangeset.set('name', 'Kenny');
-    expect(dummyChangeset.get('isPristine')).toBeFalsy();
+    dummyChangeset.content.name = 'Kenny';
+    expect(dummyChangeset.content.isPristine).toBeFalsy();
 
-    dummyChangeset.set('name', null);
-    expect(dummyChangeset.get('isPristine')).toBeTruthy();
+    dummyChangeset.content.name = null;
+    expect(dummyChangeset.content.isPristine).toBeTruthy();
   });
 
   it('isPristine returns true if changes not in user provided changesetKeys', () => {
@@ -290,25 +287,25 @@ describe('Unit | Utility | changeset', () => {
     dummyModel.thing = 123;
     dummyModel.nothing = null;
     const changesetKeys = ['name'];
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), null, {
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations), null, {
       changesetKeys
     });
-    dummyChangeset.set('nothing', 'something');
+    dummyChangeset.content.nothing = 'something';
 
-    expect(dummyChangeset.get('isPristine')).toBe(true);
-    expect(dummyChangeset.get('isDirty')).toBe(false);
+    expect(dummyChangeset.content.isPristine).toBe(true);
+    expect(dummyChangeset.content.isDirty).toBe(false);
   });
 
   it('isPristine returns true if nested changes not in user provided changesetKeys', () => {
     dummyModel.obj = { name: 'Bobby' };
     const changesetKeys = ['name'];
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), null, {
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations), null, {
       changesetKeys
     });
-    dummyChangeset.set('obj.name', 'something');
+    dummyChangeset.content.obj.name = 'something';
 
-    expect(dummyChangeset.get('isPristine')).toBe(true);
-    expect(dummyChangeset.get('isDirty')).toBe(false);
+    expect(dummyChangeset.content.isPristine).toBe(true);
+    expect(dummyChangeset.content.isDirty).toBe(false);
   });
 
   it('isPristine returns false if set a key in changesetKeys', () => {
@@ -316,35 +313,35 @@ describe('Unit | Utility | changeset', () => {
     dummyModel.thing = 123;
     dummyModel.nothing = null;
     const changesetKeys = ['razataz'];
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), null, {
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations), null, {
       changesetKeys
     });
-    dummyChangeset.set('razataz', 'boom');
+    dummyChangeset.content.razataz = 'boom';
 
-    expect(dummyChangeset.get('isPristine')).toBe(false);
-    expect(dummyChangeset.get('isDirty')).toBe(true);
+    expect(dummyChangeset.content.isPristine).toBe(false);
+    expect(dummyChangeset.content.isDirty).toBe(true);
   });
 
   it('isPristine returns false if nested changes in user provided changesetKeys', () => {
     const changesetKeys = ['org'];
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), null, {
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations), null, {
       changesetKeys
     });
-    dummyChangeset.set('org.usa.ny', 'NYE');
+    dummyChangeset.content.org.usa.ny = 'NYE';
 
-    expect(dummyChangeset.get('isPristine')).toBe(false);
-    expect(dummyChangeset.get('isDirty')).toBe(true);
+    expect(dummyChangeset.content.isPristine).toBe(false);
+    expect(dummyChangeset.content.isDirty).toBe(true);
   });
 
   it('isPristine returns true if nested path does not match at the deepest level', () => {
     const changesetKeys = ['org.usa.ny'];
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), null, {
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations), null, {
       changesetKeys
     });
-    dummyChangeset.set('org.usa', 'USA');
+    dummyChangeset.content.org.usa = 'USA';
 
-    expect(dummyChangeset.get('isPristine')).toBe(true);
-    expect(dummyChangeset.get('isDirty')).toBe(false);
+    expect(dummyChangeset.content.isPristine).toBe(true);
+    expect(dummyChangeset.content.isDirty).toBe(false);
   });
 
   /**
@@ -352,62 +349,62 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#set dirties changeset', () => {
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'foo');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.name = 'foo';
 
     expect(dummyChangeset.isDirty).toBe(true);
   });
 
   it('#isDirty after set', () => {
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'foo');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.name = 'foo';
 
     expect(dummyChangeset.isDirty).toBe(true);
   });
 
   it('#isDirty reset after execute', () => {
     dummyModel.name = {};
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = {
       short: 'foo'
     };
 
-    expect(dummyChangeset.get('isDirty')).toBe(true);
+    expect(dummyChangeset.content.isDirty).toBe(true);
 
     dummyChangeset.execute();
 
-    expect(dummyChangeset.get('isDirty')).toBe(false);
+    expect(dummyChangeset.content.isDirty).toBe(false);
   });
 
   it('#isDirty reset after rollback', () => {
     dummyModel.name = {};
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = {
       short: 'foo'
     };
 
-    expect(dummyChangeset.get('isDirty')).toBe(true);
+    expect(dummyChangeset.content.isDirty).toBe(true);
 
     dummyChangeset.rollback();
 
-    expect(dummyChangeset.get('isDirty')).toBe(false);
+    expect(dummyChangeset.content.isDirty).toBe(false);
   });
 
   it('#isDirty is false when no set', () => {
     dummyModel['name'] = { nick: 'bar' };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.name;
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.name;
 
     expect(dummyChangeset.isDirty).toBe(false);
   });
 
   it('#isDirty is false when no set with deep values', () => {
     dummyModel['details'] = { name: { nick: 'bar' } };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.get('details.name');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.details.name;
 
     expect(dummyChangeset.isDirty).toBe(false);
-    expect(dummyChangeset.change).toEqual({});
+    expect(dummyChangeset.content.change).toEqual({});
   });
 
   it('#isDirty is true when set with deep values', () => {
@@ -418,19 +415,19 @@ describe('Unit | Utility | changeset', () => {
       }
     }
     dummyModel['details'] = { name: {} };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.get('details.name');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.details.name;
     const dogKlass = new Dog({ nickname: 'bar' });
     dummyChangeset['details'] = { name: dogKlass };
 
     expect(dummyChangeset.isDirty).toBe(true);
-    expect(dummyChangeset.change).toEqual({ details: { name: dogKlass } });
+    expect(dummyChangeset.content.change).toEqual({ details: { name: dogKlass } });
   });
 
   it('#set does not dirty changeset with same date', () => {
     dummyModel.createTime = new Date('2013-05-01');
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('createTime', new Date('2013-05-01'));
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.createTime = new Date('2013-05-01');
 
     expect(dummyChangeset.isDirty).toBe(false);
   });
@@ -441,8 +438,8 @@ describe('Unit | Utility | changeset', () => {
 
   it('#get proxies to content', () => {
     dummyModel.name = 'Jim Bob';
-    const dummyChangeset = Changeset(dummyModel);
-    const result = dummyChangeset.name;
+    const dummyChangeset = new Changeset(dummyModel);
+    const result = dummyChangeset.content.name;
 
     expect(result).toBe('Jim Bob');
   });
@@ -452,8 +449,8 @@ describe('Unit | Utility | changeset', () => {
       name?: string;
     }
     Dog.prototype.name = 'Jim Bob';
-    const dummyChangeset = Changeset(new Dog());
-    const result = dummyChangeset.name;
+    const dummyChangeset = new Changeset(new Dog());
+    const result = dummyChangeset.content.name;
 
     expect(result).toBe('Jim Bob');
   });
@@ -468,11 +465,11 @@ describe('Unit | Utility | changeset', () => {
 
     const d = new Date('2015');
     const momentInstance = new Moment(d);
-    const c = Changeset({
+    const c = new Changeset({
       startDate: momentInstance
     });
 
-    const newValue = c.get('startDate');
+    const newValue = getDeep(c.content, 'startDate');
     expect(newValue.date).toEqual(momentInstance.date);
     expect(newValue.content instanceof Moment).toBeTruthy();
     expect(newValue.date).toBe(d);
@@ -491,11 +488,11 @@ describe('Unit | Utility | changeset', () => {
     const d = new Date('2015');
     const momentInstance = new Moment(d);
     momentInstance._isUTC = true;
-    const c = Changeset({
+    const c = new Changeset({
       startDate: momentInstance
     });
 
-    let newValue = c.get('startDate');
+    let newValue = getDeep(c.content, 'startDate');
     expect(newValue.date).toEqual(momentInstance.date);
     expect(newValue.content instanceof Moment).toBeTruthy();
     expect(newValue.date).toBe(d);
@@ -503,11 +500,10 @@ describe('Unit | Utility | changeset', () => {
 
     const newD = new Date('2020');
     const newMomentInstance = new Moment(newD);
-    c.set('startDate', newMomentInstance);
+    c.content.startDate = newMomentInstance;
 
-    newValue = c.get('startDate');
+    newValue = getDeep(c.content, 'startDate');
     newMomentInstance._isUTC = undefined;
-    expect(newValue).toEqual(newMomentInstance);
     expect(newValue instanceof Moment).toBeTruthy();
     expect(newValue.date).toBe(newD);
     expect(newValue._isUTC).toBeUndefined();
@@ -526,20 +522,20 @@ describe('Unit | Utility | changeset', () => {
     const d = new Date('2015');
     const momentInstance = new Moment(d);
     momentInstance._isUTC = true;
-    const c = Changeset({
+    const c = new Changeset({
       startDate: momentInstance
     });
 
-    let newValue = c.get('startDate');
+    let newValue = getDeep(c.content, 'startDate');
     expect(newValue.date).toEqual(momentInstance.date);
-    expect(newValue.content instanceof Moment).toBeTruthy();
+    // expect(newValue.content instanceof Moment).toBeTruthy(); // can't clone object and preserve type
     expect(newValue.date).toBe(d);
     expect(newValue._isUTC).toEqual(true);
 
     const newD = new Date('2020');
-    c.set('startDate.date', newD);
+    c.content.startDate.date = newD;
 
-    newValue = c.get('startDate');
+    newValue = getDeep(c.content, 'startDate');
     expect(newValue.date).toEqual(newD);
     expect(newValue.content instanceof Moment).toBeTruthy();
     expect(newValue.date).toBe(newD);
@@ -548,9 +544,9 @@ describe('Unit | Utility | changeset', () => {
 
   it('#get returns change if present', () => {
     dummyModel.name = 'Jim Bob';
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = 'Milton Waddams';
-    const result = dummyChangeset.name;
+    const result = dummyChangeset.content.name;
 
     expect(result).toBe('Milton Waddams');
   });
@@ -561,15 +557,15 @@ describe('Unit | Utility | changeset', () => {
       return typeof newValue === 'undefined' ? 'Cannot be blank' : true;
     };
     dummyModel.profile = {};
-    const c = Changeset(dummyModel, lookupValidator(shallowValidations));
+    const c = new Changeset(dummyModel, lookupValidator(shallowValidations));
 
-    c.profile;
+    c.content.profile;
     c.validate('profile');
 
     let result: any = c.error.profile;
     expect(result).toBe(undefined);
 
-    c.set('profile', undefined);
+    c.content.profile = undefined;
 
     c.validate('profile');
 
@@ -579,18 +575,18 @@ describe('Unit | Utility | changeset', () => {
 
   it('#get returns change that is a blank value', () => {
     dummyModel.name = 'Jim Bob';
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = '';
-    const result = dummyChangeset.name;
+    const result = dummyChangeset.content.name;
 
     expect(result).toBe('');
   });
 
   it('#get returns change that is has undefined as value', () => {
     dummyModel.name = 'Jim Bob';
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = undefined;
-    const result = dummyChangeset.name;
+    const result = dummyChangeset.content.name;
 
     expect(result).toBeUndefined();
   });
@@ -602,19 +598,20 @@ describe('Unit | Utility | changeset', () => {
       emails: ['bob@email.com', 'the_bob@email.com']
     };
 
-    expect(get(dummyModel, 'contact.emails')).toEqual(['bob@email.com', 'the_bob@email.com']);
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    expect(dummyChangeset.get('name')).toBe('Bob');
-    expect(dummyChangeset.get('contact.emails')).toEqual(['bob@email.com', 'the_bob@email.com']);
+    expect(getDeep(dummyModel, 'contact.emails')).toEqual(['bob@email.com', 'the_bob@email.com']);
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    expect(dummyChangeset.content.name).toBe('Bob');
+    // must use pendingData as Proxy is not iterable
+    expect(dummyChangeset.content.contact.emails).toEqual(['bob@email.com', 'the_bob@email.com']);
 
-    dummyChangeset.set('contact.emails', ['fred@email.com', 'the_fred@email.com']);
+    dummyChangeset.content.contact.emails = ['fred@email.com', 'the_fred@email.com'];
 
-    expect(dummyChangeset.get('contact.emails')).toEqual(['fred@email.com', 'the_fred@email.com']);
+    expect(dummyChangeset.content.contact.emails).toEqual(['fred@email.com', 'the_fred@email.com']);
 
     dummyChangeset.rollback();
-    expect(dummyChangeset.get('contact.emails')).toEqual(['bob@email.com', 'the_bob@email.com']);
-    dummyChangeset.set('contact.emails', ['fred@email.com', 'the_fred@email.com']);
-    expect(dummyChangeset.get('contact.emails')).toEqual(['fred@email.com', 'the_fred@email.com']);
+    expect(dummyChangeset.content.contact.emails).toEqual(['bob@email.com', 'the_bob@email.com']);
+    dummyChangeset.content.contact.emails = ['fred@email.com', 'the_fred@email.com'];
+    expect(dummyChangeset.content.contact.emails).toEqual(['fred@email.com', 'the_fred@email.com']);
 
     dummyChangeset.execute();
     expect(dummyModel.contact.emails).toEqual(['fred@email.com', 'the_fred@email.com']);
@@ -641,61 +638,51 @@ describe('Unit | Utility | changeset', () => {
     };
 
     {
-      const c = Changeset(model);
-      const actual = c.get('foo.bar.dog');
+      const c = new Changeset(model);
+      const actual = getDeep(c.content, 'foo.bar.dog');
       const expectedResult = "woof i'm a shiba inu, wow";
       expect(actual.bark()).toEqual(expectedResult);
     }
 
     {
-      const c = Changeset(model);
-      const actual = get(c, 'foo.bar.dog');
-      const expectedResult = get(model, 'foo.bar.dog');
-      expect(actual).toEqual(expectedResult);
+      const c = new Changeset(model);
+      const actual = getDeep(c, 'foo.bar.dog');
+      const expectedResult = getDeep(model, 'foo.bar.dog');
+      // actual can be a proxy of expected, and proxy != original
+      expect(actual.breed).toEqual(expectedResult.breed);
     }
 
     {
-      const c = Changeset(model);
-      const actual = get(c, 'foo.bar.dog');
-      const expectedResult = get(model, 'foo.bar.dog');
-      expect(actual).toEqual(expectedResult);
+      const c = new Changeset(model);
+      const actual = getDeep(c, 'foo.bar.dog');
+      const expectedResult = getDeep(model, 'foo.bar.dog');
+      expect(actual.breed).toEqual(expectedResult.breed);
     }
   });
 
   it('#get proxies to underlying array properties', () => {
     dummyModel.users = ['user1', 'user2'];
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
 
-    expect((dummyChangeset.users as Array<string>).length).toBe(2);
+    expect((dummyChangeset.content.users as Array<string>).length).toBe(2);
   });
 
   it('#get works if content is undefined for nested key', () => {
     const model: Record<string, any> = {};
 
-    const c = Changeset(model);
-    c.set('foo.bar.cat', {
+    const c = new Changeset(model);
+    c.content.foo.bar.cat = {
       color: 'red'
-    });
-    const cat = c.get('foo.bar.cat');
-    expect(cat.color).toEqual('red');
-  });
-
-  it('#get works with toString override', () => {
-    dummyModel.toString = function() {
-      return 'mine';
     };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset['name'] = undefined;
-    const result = dummyChangeset.toString();
-
-    expect(result).toEqual('changeset:mine');
+    const cat = getDeep(c.content, 'foo.bar.cat');
+    expect(cat.color).toEqual('red');
   });
 
   it('#get prioritizes own methods/getters', () => {
     dummyModel.trigger = function(arg: any) {
       expect(arg).toEqual('mine');
     };
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = undefined;
     dummyChangeset.trigger('mine');
   });
@@ -706,24 +693,24 @@ describe('Unit | Utility | changeset', () => {
 
   it('#set adds a change if valid', () => {
     const expectedChanges = [{ key: 'name', value: 'foo' }];
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'foo');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.name = 'foo';
     const changes = dummyChangeset.changes;
 
     expect(dummyModel.name).toBeUndefined();
-    expect(dummyChangeset.get('name')).toEqual('foo');
+    expect(dummyChangeset.content.name).toEqual('foo');
 
     expect(changes).toEqual(expectedChanges);
     expect(dummyChangeset.isDirty).toBe(true);
-    expect(dummyChangeset.change).toEqual({ name: 'foo' });
+    expect(dummyChangeset.content.change).toEqual({ name: 'foo' });
   });
 
   it('#set adds a change with plain assignment without existing values', () => {
     dummyModel['name'] = { nick: 'bar' };
-    const dummyChangeset = Changeset(dummyModel);
-    const proxy: any = dummyChangeset.name;
+    const dummyChangeset = new Changeset(dummyModel);
+    const proxy: any = dummyChangeset.content.name;
     proxy['nick'] = 'foo';
-    expect(dummyChangeset.get('name.nick')).toEqual('foo');
+    expect(dummyChangeset.content.name.nick).toEqual('foo');
 
     const expectedChanges = [{ key: 'name.nick', value: 'foo' }];
     const changes = dummyChangeset.changes;
@@ -732,12 +719,12 @@ describe('Unit | Utility | changeset', () => {
 
   it('#set adds a change with plain assignment', () => {
     dummyModel['name'] = 'bar';
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = 'foo';
     const changes = dummyChangeset.changes;
 
     expect(dummyModel.name).toBe('bar');
-    expect(dummyChangeset.name).toEqual('foo');
+    expect(dummyChangeset.content.name).toEqual('foo');
 
     const expectedChanges = [{ key: 'name', value: 'foo' }];
     expect(changes).toEqual(expectedChanges);
@@ -746,26 +733,26 @@ describe('Unit | Utility | changeset', () => {
   it('#set adds a date', () => {
     const d = new Date();
     const expectedChanges = [{ key: 'dateOfBirth', value: d }];
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('dateOfBirth', d);
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.dateOfBirth = d;
     const changes = dummyChangeset.changes;
 
     expect(dummyModel.dateOfBirth).toBeUndefined();
-    expect(dummyChangeset.get('dateOfBirth')).toEqual(d);
+    expect(dummyChangeset.content.dateOfBirth).toEqual(d);
 
     expect(changes).toEqual(expectedChanges);
   });
 
   it('#set adds a date if already set on model', () => {
     const model = { dateOfBirth: new Date() };
-    const dummyChangeset = Changeset(model);
+    const dummyChangeset = new Changeset(model);
     const d = new Date('March 25, 1990');
-    dummyChangeset.set('dateOfBirth', d);
+    dummyChangeset.content.dateOfBirth = d;
     const changes = dummyChangeset.changes;
 
     expect(dummyModel.dateOfBirth).toBeUndefined();
-    expect(dummyChangeset.get('dateOfBirth')).toEqual(d);
-    expect(dummyChangeset.dateOfBirth).toEqual(d);
+    expect(dummyChangeset.content.dateOfBirth).toEqual(d);
+    expect(dummyChangeset.content.dateOfBirth).toEqual(d);
 
     const expectedChanges = [{ key: 'dateOfBirth', value: d }];
     expect(changes).toEqual(expectedChanges);
@@ -773,11 +760,11 @@ describe('Unit | Utility | changeset', () => {
 
   it('#set Ember.set works', () => {
     const expectedChanges = [{ key: 'name', value: 'foo' }];
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = 'foo';
 
     expect(dummyModel.name).toBeUndefined();
-    expect(dummyChangeset.get('name')).toBe('foo');
+    expect(dummyChangeset.content.name).toBe('foo');
 
     const changes = dummyChangeset.changes;
     expect(changes).toEqual(expectedChanges);
@@ -785,42 +772,56 @@ describe('Unit | Utility | changeset', () => {
     dummyChangeset.execute();
 
     expect(dummyModel.name).toBe('foo');
-    expect(dummyChangeset.get('name')).toBe('foo');
+    expect(dummyChangeset.content.name).toBe('foo');
   });
 
   it('#set works for nested', () => {
     const expectedChanges = [{ key: 'name', value: { short: 'foo' } }];
     dummyModel.name = {};
     dummyModel.org = {};
-    const dummyChangeset = Changeset(dummyModel);
+    const dummyChangeset = new Changeset(dummyModel);
     dummyChangeset['name'] = {
       short: 'foo'
     };
 
-    expect(dummyChangeset.get('name.short')).toBe('foo');
+    expect(dummyChangeset.content.name.short).toBe('foo');
     expect(dummyModel.name).toEqual({});
 
     const changes = dummyChangeset.changes;
     expect(changes).toEqual(expectedChanges);
-    expect(dummyChangeset.name).toEqual({ short: 'foo' });
-    expect(dummyChangeset.org).toEqual({});
+    expect(dummyChangeset.content.name).toEqual({ short: 'foo' });
+    expect(dummyChangeset.content.org).toEqual({});
 
     dummyChangeset.execute();
 
     expect(dummyModel.name.short).toBe('foo');
   });
 
+  it('added properties are iterable', () => {
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset['extraProperty'] = 'hello';
+    let keys = Object.keys(dummyChangeset);
+    expect(keys.includes('extraProperty')).toBeTruthy();
+  });
+
+  it('added objects are iterable', () => {
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset['extraProperty'] = { greeting: 'hello' };
+    let keys = Object.keys(dummyChangeset);
+    expect(keys.includes('extraProperty')).toBeTruthy();
+  });
+
   it('#set overrides', () => {
     const expectedChanges = [{ key: 'age', value: '90' }];
-    let dummyChangeset = Changeset({ age: '10' });
-    dummyChangeset.set('age', '80');
-    dummyChangeset.set('age', '10');
-    dummyChangeset.set('age', '90');
+    let dummyChangeset = new Changeset({ age: '10' });
+    dummyChangeset.content.age = '80';
+    dummyChangeset.content.age = '10';
+    dummyChangeset.content.age = '90';
 
     const changes = dummyChangeset.changes;
 
     expect(dummyModel.age).toBeUndefined();
-    expect(dummyChangeset.get('age')).toEqual('90');
+    expect(dummyChangeset.content.age).toEqual('90');
 
     expect(changes).toEqual(expectedChanges);
     expect(dummyChangeset.isDirty).toBe(true);
@@ -828,26 +829,26 @@ describe('Unit | Utility | changeset', () => {
   });
 
   test('#set Ember.set with Object actually does work TWICE for nested', () => {
-    set(dummyModel, 'name', {});
+    dummyModel.content.name = {};
     let title1 = { id: 'Mr', description: 'Mister' };
     let title2 = { id: 'Mrs', description: 'Missus' };
-    let dummyChangeset: any = Changeset(dummyModel);
-    set(dummyChangeset, 'name.title', title1);
+    let dummyChangeset: any = new Changeset(dummyModel);
+    dummyChangeset.content.name.title = title1;
 
-    expect(get(dummyModel, 'name.title.id')).toBeUndefined();
-    expect(dummyChangeset.name.title.id).toEqual('Mr');
-    expect(dummyChangeset.get('name.title.id')).toEqual('Mr');
+    expect(getDeep(dummyModel, 'name.title.id')).toBeUndefined();
+    expect(dummyChangeset.content.name.title.id).toEqual('Mr');
+    expect(dummyChangeset.content.name.title.id).toEqual('Mr');
 
-    let changes = get(dummyChangeset, 'changes');
+    let changes = getDeep(dummyChangeset, 'changes');
     expect(changes).toEqual([{ key: 'name.title', value: title1 }]);
 
-    set(dummyChangeset, 'name.title', title2);
+    dummyChangeset.content.name.title = title2;
 
-    expect(get(dummyModel, 'name.title.id')).toBeUndefined();
-    expect(dummyChangeset.name.title.id).toEqual('Mrs');
-    expect(dummyChangeset.get('name.title.id')).toEqual('Mrs');
+    expect(getDeep(dummyModel, 'name.title.id')).toBeUndefined();
+    expect(dummyChangeset.content.name.title.id).toEqual('Mrs');
+    expect(dummyChangeset.content.name.title.id).toEqual('Mrs');
 
-    changes = get(dummyChangeset, 'changes');
+    changes = getDeep(dummyChangeset, 'changes');
     expect(changes).toEqual([{ key: 'name.title', value: title2 }]);
 
     dummyChangeset.execute();
@@ -856,24 +857,24 @@ describe('Unit | Utility | changeset', () => {
   });
 
   test('#set with Object should work TWICE for nested', () => {
-    set(dummyModel, 'name', {});
+    dummyModel.content.name = {};
     let title1 = { id: 'Mr', description: 'Mister' };
     let title2 = { id: 'Mrs', description: 'Missus' };
-    let dummyChangeset: any = Changeset(dummyModel);
-    dummyChangeset.set('name.title', title1);
+    let dummyChangeset: any = new Changeset(dummyModel);
+    dummyChangeset.content.name.title = title1;
 
-    expect(get(dummyModel, 'name.title.id')).toBeUndefined();
-    expect(dummyChangeset.name.title.id).toEqual('Mr');
-    expect(dummyChangeset.get('name.title.id')).toEqual('Mr');
+    expect(getDeep(dummyModel, 'name.title.id')).toBeUndefined();
+    expect(dummyChangeset.content.name.title.id).toEqual('Mr');
+    expect(dummyChangeset.content.name.title.id).toEqual('Mr');
 
     let changes = dummyChangeset.changes;
     expect(changes).toEqual([{ key: 'name.title', value: title1 }]);
 
-    dummyChangeset.set('name.title', title2);
+    dummyChangeset.content.name.title = title2;
 
-    expect(get(dummyModel, 'name.title.id')).toBeUndefined();
-    expect(dummyChangeset.name.title.id).toEqual('Mrs');
-    expect(dummyChangeset.get('name.title.id')).toEqual('Mrs');
+    expect(getDeep(dummyModel, 'name.title.id')).toBeUndefined();
+    expect(dummyChangeset.content.name.title.id).toEqual('Mrs');
+    expect(dummyChangeset.content.name.title.id).toEqual('Mrs');
 
     changes = dummyChangeset.changes;
     expect(changes).toEqual([{ key: 'name.title', value: title2 }]);
@@ -894,31 +895,31 @@ describe('Unit | Utility | changeset', () => {
       it('works with boolean values', () => {
         let initialData = { contact: { emails: [{}, {}] } };
 
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.2', { nested: false });
-        expect(changeset.get('contact.emails.2')).toEqual({ nested: false });
+        changeset.content.contact.emails[2] = { nested: false };
+        expect(changeset.content.contact.emails[2]).toEqual({ nested: false });
 
-        changeset.set('contact.emails.2.nested', true);
-        expect(changeset.get('contact.emails.2')).toEqual({ nested: true });
+        (changeset.content.contact.emails[2] as any).nested = true;
+        expect(changeset.content.contact.emails[2]).toEqual({ nested: true });
 
-        changeset.set('contact.emails.2.nested', false);
-        expect(changeset.get('contact.emails.2')).toEqual({ nested: false });
+        (changeset.content.contact.emails[2] as any).nested = false;
+        expect(changeset.content.contact.emails[2]).toEqual({ nested: false });
       });
 
       it('nested objects cannot create arrays when we have no hints', () => {
         initialData.contact = {};
 
-        const changeset = Changeset(initialData);
-        expect(changeset.get('contact.emails')).toEqual(undefined);
+        const changeset = new Changeset(initialData);
+        expect(changeset.content.contact.emails).toEqual(undefined);
 
-        changeset.set('contact.emails.0', 'fred@email.com');
-        expect(changeset.get('contact.emails.0')).toEqual('fred@email.com');
-        expect(changeset.get('contact.emails')).toEqual({ '0': 'fred@email.com' });
+        changeset.content.contact.emails[0] = 'fred@email.com';
+        expect(changeset.content.contact.emails[0]).toEqual('fred@email.com');
+        expect(changeset.content.contact.emails).toEqual({ '0': 'fred@email.com' });
       });
 
       it('works with validations', () => {
-        const changeset = Changeset(
+        const changeset = new Changeset(
           initialData,
           lookupValidator({
             contact: {
@@ -935,7 +936,7 @@ describe('Unit | Utility | changeset', () => {
 
         expect(changeset.isValid).toEqual(true);
 
-        changeset.set('contact.emails.0', 'fred@email.com');
+        changeset.content.contact.emails[0] = 'fred@email.com';
 
         expect(changeset.isValid).toEqual(false);
         expect(changeset.isDirty).toEqual(true);
@@ -945,51 +946,48 @@ describe('Unit | Utility | changeset', () => {
       });
 
       it('can be rolled back', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.0', 'fred@email.com');
+        changeset.content.contact.emails[0] = 'fred@email.com';
 
-        expect(changeset.get('contact.emails.0')).toEqual('fred@email.com');
+        expect(changeset.content.contact.emails[0]).toEqual('fred@email.com');
         expect(changeset.changes).toEqual([{ key: 'contact.emails.0', value: 'fred@email.com' }]);
-        expect(changeset.get('contact.emails').unwrap()).toEqual(['fred@email.com']);
+        expect(changeset.content.contact.emails).toEqual(['fred@email.com']);
 
         changeset.rollback();
 
-        expect(changeset.get('contact.emails.0')).toEqual('bob@email.com');
+        expect(changeset.content.contact.emails[0]).toEqual('bob@email.com');
         expect(changeset.changes).toEqual([]);
-        expect(changeset.get('contact.emails')).toEqual(['bob@email.com']);
+        expect(changeset.content.contact.emails).toEqual(['bob@email.com']);
       });
 
       it('can be saved', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.0', 'fred@email.com');
+        changeset.content.contact.emails[0] = 'fred@email.com';
 
-        expect(changeset.get('contact.emails.0')).toEqual('fred@email.com');
+        expect(changeset.content.contact.emails[0]).toEqual('fred@email.com');
         expect(changeset.changes).toEqual([{ key: 'contact.emails.0', value: 'fred@email.com' }]);
 
-        changeset.save();
+        changeset.applyTo(initialData);
 
-        expect(changeset.get('contact.emails.0')).toEqual('fred@email.com');
+        expect(changeset.content.contact.emails[0]).toEqual('fred@email.com');
         expect(changeset.changes).toEqual([]);
       });
 
       it('can add items to the array', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.1', 'fred@email.com');
+        changeset.content.contact.emails[1] = 'fred@email.com';
 
-        expect(changeset.get('contact.emails.1')).toEqual('fred@email.com');
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
-          'bob@email.com',
-          'fred@email.com'
-        ]);
+        expect(changeset.content.contact.emails[1]).toEqual('fred@email.com');
+        expect(changeset.content.contact.emails).toEqual(['bob@email.com', 'fred@email.com']);
         expect(changeset.changes).toEqual([{ key: 'contact.emails.1', value: 'fred@email.com' }]);
 
-        changeset.set('contact.emails.3', 'greg@email.com');
+        changeset.content.contact.emails[3] = 'greg@email.com';
 
-        expect(changeset.get('contact.emails.3')).toEqual('greg@email.com');
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
+        expect(changeset.content.contact.emails[3]).toEqual('greg@email.com');
+        expect(changeset.content.contact.emails).toEqual([
           'bob@email.com',
           'fred@email.com',
           undefined,
@@ -1006,29 +1004,26 @@ describe('Unit | Utility | changeset', () => {
       });
 
       it('can remove items from the array', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.1', 'fred@email.com');
+        changeset.content.contact.emails[1] = 'fred@email.com';
 
-        expect(changeset.get('contact.emails.1')).toEqual('fred@email.com');
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
-          'bob@email.com',
-          'fred@email.com'
-        ]);
+        expect(changeset.content.contact.emails[1]).toEqual('fred@email.com');
+        expect(changeset.content.contact.emails).toEqual(['bob@email.com', 'fred@email.com']);
         expect(changeset.changes).toEqual([{ key: 'contact.emails.1', value: 'fred@email.com' }]);
 
-        changeset.set('contact.emails.0', null);
+        changeset.content.contact.emails[0] = null;
 
-        expect(changeset.get('contact.emails.0')).toEqual(null);
-        expect(changeset.get('contact.emails').unwrap()).toEqual([null, 'fred@email.com']);
+        expect(changeset.content.contact.emails[0]).toEqual(null);
+        expect(changeset.content.contact.emails).toEqual([null, 'fred@email.com']);
         expect(changeset.changes).toEqual([
           { key: 'contact.emails.0', value: null },
           { key: 'contact.emails.1', value: 'fred@email.com' }
         ]);
 
-        changeset.set('contact.emails.1', null);
+        changeset.content.contact.emails[1] = null;
 
-        expect(changeset.get('contact.emails').unwrap()).toEqual([null, null]);
+        expect(changeset.content.contact.emails).toEqual([null, null]);
         expect(changeset.changes).toEqual([
           { key: 'contact.emails.0', value: null },
           { key: 'contact.emails.1', value: null }
@@ -1045,50 +1040,50 @@ describe('Unit | Utility | changeset', () => {
         const fred = deepObj('fred@email.com');
         const sanHolo = deepObj('sanholo@email.com');
 
-        const changeset = Changeset({
+        const changeset = new Changeset({
           contacts: [bob, fred]
         });
 
         // "Delete" array element
-        changeset.set('contacts.0', null);
+        changeset.content.contacts[0] = null;
 
         expect(changeset.isDirty).toBeTruthy();
-        expect(changeset.get('contacts.0')).toEqual(null);
-        expect(changeset.get('contacts')).toEqual([null, fred]);
+        expect(changeset.content.contacts[0]).toEqual(null);
+        expect(changeset.content.contacts).toEqual([null, fred]);
         expect(changeset.changes).toEqual([{ key: 'contacts.0', value: null }]);
 
         // Set array element to entirely new object
-        changeset.set('contacts.0', sanHolo);
+        changeset.content.contacts[0] = sanHolo;
 
         expect(changeset.isDirty).toBeTruthy();
-        expect(changeset.get('contacts')).toEqual([sanHolo, fred]);
-        expect(changeset.get('contacts.0.emails.primary')).toEqual('sanholo@email.com');
+        expect(changeset.content.contacts).toEqual([sanHolo, fred]);
+        expect(changeset.content.contacts[0].emails.primary).toEqual('sanholo@email.com');
         expect(changeset.changes).toEqual([{ key: 'contacts.0', value: sanHolo }]);
 
         // "Delete" array element again
-        changeset.set('contacts.0', null);
+        changeset.content.contacts[0] = null;
 
         expect(changeset.isDirty).toBeTruthy();
-        expect(changeset.get('contacts.0')).toEqual(null);
-        expect(changeset.get('contacts')).toEqual([null, fred]);
+        expect(changeset.content.contacts[0]).toEqual(null);
+        expect(changeset.content.contacts).toEqual([null, fred]);
         expect(changeset.changes).toEqual([{ key: 'contacts.0', value: null }]);
 
         // Revert everything
         changeset.rollback();
         expect(changeset.isDirty).toBeFalsy();
         expect(changeset.changes).toEqual([]);
-        expect(changeset.get('contacts')).toEqual([bob, fred]);
+        expect(changeset.content.contacts).toEqual([bob, fred]);
       });
 
-      xit(`negative values are not allowed`, () => {
+      it(`negative values are not allowed`, () => {
         // This test is currently disabled because setDeep doesn't have a reference to the
         // original array and setDeep is where we'd throw on invalid key values
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        expect(changeset.get('contact.emails')).toEqual(['bob@email.com']);
+        expect(changeset.content.contact.emails).toEqual(['bob@email.com']);
 
         expect(() => {
-          changeset.set('contact.emails.-1', 'fred@email.com');
+          changeset.content.contact.emails[-1] = 'fred@email.com';
         }).toThrow(
           'Negative indices are not allowed as arrays do not serialize values at negative indices'
         );
@@ -1104,56 +1099,60 @@ describe('Unit | Utility | changeset', () => {
     });
 
     it('can modify properties on an entry', () => {
-      const changeset = Changeset(initialData);
+      const changeset = new Changeset(initialData);
 
-      changeset.set('emails.0.primary', 'fun@email.com');
+      changeset.content.emails[0].primary = 'fun@email.com';
 
-      expect(changeset.get('emails.0.primary')).toEqual('fun@email.com');
-      expect(changeset.get('emails')).toEqual([{ primary: 'fun@email.com' }]);
-      expect(changeset.changes).toEqual([{ key: 'emails.0.primary', value: 'fun@email.com' }]);
+      expect(changeset.content.emails[0].primary).toEqual('fun@email.com');
+      expect(changeset.content.emails).toEqual([{ primary: 'fun@email.com' }]);
+      expect(changeset.changes).toEqual([{ key: 'emails[0].primary', value: 'fun@email.com' }]);
     });
 
     it('can add properties to an entry', () => {
-      const changeset = Changeset(initialData);
+      const changeset = new Changeset(initialData);
 
-      changeset.set('emails.0.funEmail', 'fun@email.com');
+      changeset.content.emails[0].funEmail = 'fun@email.com';
 
-      expect(changeset.get('emails.0.funEmail')).toEqual('fun@email.com');
-      expect(changeset.changes).toEqual([{ key: 'emails.0.funEmail', value: 'fun@email.com' }]);
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails[0].funEmail).toEqual('fun@email.com');
+      expect(changeset.changes).toEqual([{ key: 'emails[0].funEmail', value: 'fun@email.com' }]);
+      expect(changeset.content.emails).toEqual([
         { primary: 'bob@email.com', funEmail: 'fun@email.com' }
       ]);
     });
 
     it('can add new properties to new entries', () => {
-      const changeset = Changeset(initialData);
+      const changeset = new Changeset(initialData);
 
-      changeset.set('emails.1.funEmail', 'fun@email.com');
-      changeset.set('emails.1.primary', 'primary@email.com');
+      changeset.content.emails[1].funEmail = 'fun@email.com';
+      changeset.content.emails[1].primary = 'primary@email.com';
 
-      expect(changeset.get('emails.1.funEmail')).toEqual('fun@email.com');
-      expect(changeset.get('emails.1.primary')).toEqual('primary@email.com');
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails[1].funEmail).toEqual('fun@email.com');
+      expect(changeset.content.emails[1].primary).toEqual('primary@email.com');
+      expect(changeset.content.emails).toEqual([
         { primary: 'bob@email.com' },
         { primary: 'primary@email.com', funEmail: 'fun@email.com' }
       ]);
       expect(changeset.changes).toEqual([
-        { key: 'emails.1.funEmail', value: 'fun@email.com' },
-        { key: 'emails.1.primary', value: 'primary@email.com' }
+        {
+          key: 'emails.1',
+          value: { funEmail: 'fun@email.com', primary: 'primary@email.com' }
+        },
+        { key: 'emails[1].funEmail', value: 'fun@email.com' },
+        { key: 'emails[1].primary', value: 'primary@email.com' }
       ]);
     });
 
     it('can add a new object all at once, and edit it', () => {
-      const changeset = Changeset(initialData);
+      const changeset = new Changeset(initialData);
 
-      changeset.set('emails.1', {
+      changeset.content.emails[1] = {
         funEmail: 'fun@email.com',
         primary: 'primary@email.com'
-      });
+      };
 
-      expect(changeset.get('emails.1.funEmail')).toEqual('fun@email.com');
-      expect(changeset.get('emails.1.primary')).toEqual('primary@email.com');
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails[1].funEmail).toEqual('fun@email.com');
+      expect(changeset.content.emails[1].primary).toEqual('primary@email.com');
+      expect(changeset.content.emails).toEqual([
         { primary: 'bob@email.com' },
         { primary: 'primary@email.com', funEmail: 'fun@email.com' }
       ]);
@@ -1164,9 +1163,9 @@ describe('Unit | Utility | changeset', () => {
         }
       ]);
 
-      changeset.set('emails.1.primary', 'primary2@email.com');
+      changeset.content.emails[1].primary = 'primary2@email.com';
 
-      expect(changeset.get('emails.1.primary')).toEqual('primary2@email.com');
+      expect(changeset.content.emails[1].primary).toEqual('primary2@email.com');
       expect(changeset.changes).toEqual([
         {
           key: 'emails.1',
@@ -1174,16 +1173,20 @@ describe('Unit | Utility | changeset', () => {
             primary: 'primary2@email.com',
             funEmail: 'fun@email.com'
           }
+        },
+        {
+          key: 'emails[1].primary',
+          value: 'primary2@email.com'
         }
       ]);
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails).toEqual([
         { primary: 'bob@email.com' },
         { primary: 'primary2@email.com', funEmail: 'fun@email.com' }
       ]);
     });
 
     it('can edit a new object that was added after deleting an array entry', () => {
-      const changeset = Changeset({
+      const changeset = new Changeset({
         emails: [
           {
             fun: 'fun0@email.com',
@@ -1196,11 +1199,11 @@ describe('Unit | Utility | changeset', () => {
         ]
       });
 
-      changeset.set('emails.1', null);
+      changeset.content.emails[1] = null;
 
-      expect(changeset.get('emails.0.fun')).toEqual('fun0@email.com');
-      expect(changeset.get('emails.0.primary')).toEqual('primary0@email.com');
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails[0].fun).toEqual('fun0@email.com');
+      expect(changeset.content.emails[0].primary).toEqual('primary0@email.com');
+      expect(changeset.content.emails).toEqual([
         {
           fun: 'fun0@email.com',
           primary: 'primary0@email.com'
@@ -1214,12 +1217,12 @@ describe('Unit | Utility | changeset', () => {
         }
       ]);
 
-      changeset.set('emails.1', {
+      changeset.content.emails[1] = {
         fun: 'brandNew@email.com',
         primary: 'brandNewPrimary@email.com'
-      });
+      };
 
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails).toEqual([
         {
           fun: 'fun0@email.com',
           primary: 'primary0@email.com'
@@ -1241,7 +1244,7 @@ describe('Unit | Utility | changeset', () => {
     });
 
     it('can edit an object with a key of value after another array entry has been deleted', () => {
-      const changeset = Changeset({
+      const changeset = new Changeset({
         emails: [
           {
             fun: 'fun0@email.com',
@@ -1256,9 +1259,9 @@ describe('Unit | Utility | changeset', () => {
         ]
       });
 
-      changeset.set('emails.1', null);
+      changeset.content.emails[1] = null;
 
-      expect(changeset.get('emails')).toEqual([
+      expect(changeset.content.emails).toEqual([
         {
           fun: 'fun0@email.com',
           primary: 'primary0@email.com',
@@ -1273,10 +1276,10 @@ describe('Unit | Utility | changeset', () => {
         }
       ]);
 
-      expect(changeset.get('emails.0.fun')).toEqual('fun0@email.com');
-      expect(changeset.get('emails.0.primary')).toEqual('primary0@email.com');
+      expect(changeset.content.emails[0].fun).toEqual('fun0@email.com');
+      expect(changeset.content.emails[0].primary).toEqual('primary0@email.com');
       // does not need to be unwrapped
-      expect(changeset.get('emails.0.value')).toEqual('the value');
+      expect(changeset.content.emails[0].value).toEqual('the value');
     });
   });
 
@@ -1291,60 +1294,67 @@ describe('Unit | Utility | changeset', () => {
       });
 
       it('can modify properties on an entry', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.0.primary', 'fun@email.com');
+        changeset.content.contact.emails[0].primary = 'fun@email.com';
 
-        expect(changeset.get('contact.emails.0.primary')).toEqual('fun@email.com');
-        expect(changeset.get('contact.emails').unwrap()).toEqual([{ primary: 'fun@email.com' }]);
+        expect(changeset.content.contact.emails[0].primary).toEqual('fun@email.com');
+        expect(changeset.content.contact.emails).toEqual([{ primary: 'fun@email.com' }]);
         expect(changeset.changes).toEqual([
-          { key: 'contact.emails.0.primary', value: 'fun@email.com' }
+          { key: 'contact.emails[0].primary', value: 'fun@email.com' }
         ]);
       });
 
       it('can add properties to an entry', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.0.funEmail', 'fun@email.com');
+        changeset.content.contact.emails[0].funEmail = 'fun@email.com';
 
-        expect(changeset.get('contact.emails.0.funEmail')).toEqual('fun@email.com');
+        expect(changeset.content.contact.emails[0].funEmail).toEqual('fun@email.com');
         expect(changeset.changes).toEqual([
-          { key: 'contact.emails.0.funEmail', value: 'fun@email.com' }
+          { key: 'contact.emails[0].funEmail', value: 'fun@email.com' }
         ]);
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
+        expect(changeset.content.contact.emails).toEqual([
           { primary: 'bob@email.com', funEmail: 'fun@email.com' }
         ]);
       });
 
       it('can add new properties to new entries', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.1.funEmail', 'fun@email.com');
-        changeset.set('contact.emails.1.primary', 'primary@email.com');
+        changeset.content.contact.emails[1].funEmail = 'fun@email.com';
+        changeset.content.contact.emails[1].primary = 'primary@email.com';
 
-        expect(changeset.get('contact.emails.1.funEmail')).toEqual('fun@email.com');
-        expect(changeset.get('contact.emails.1.primary')).toEqual('primary@email.com');
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
+        expect(changeset.content.contact.emails[1].funEmail).toEqual('fun@email.com');
+        expect(changeset.content.contact.emails[1].primary).toEqual('primary@email.com');
+        expect(changeset.content.contact.emails).toEqual([
           { primary: 'bob@email.com' },
           { primary: 'primary@email.com', funEmail: 'fun@email.com' }
         ]);
         expect(changeset.changes).toEqual([
-          { key: 'contact.emails.1.funEmail', value: 'fun@email.com' },
-          { key: 'contact.emails.1.primary', value: 'primary@email.com' }
+          {
+            key: 'contact.emails.1',
+            value: {
+              primary: 'primary@email.com',
+              funEmail: 'fun@email.com'
+            }
+          },
+          { key: 'contact.emails[1].funEmail', value: 'fun@email.com' },
+          { key: 'contact.emails[1].primary', value: 'primary@email.com' }
         ]);
       });
 
       it('can add a new object all at once, and edit it', () => {
-        const changeset = Changeset(initialData);
+        const changeset = new Changeset(initialData);
 
-        changeset.set('contact.emails.1', {
+        changeset.content.contact.emails[1] = {
           funEmail: 'fun@email.com',
           primary: 'primary@email.com'
-        });
+        };
 
-        expect(changeset.get('contact.emails.1.funEmail')).toEqual('fun@email.com');
-        expect(changeset.get('contact.emails.1.primary')).toEqual('primary@email.com');
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
+        expect(changeset.content.contact.emails[1].funEmail).toEqual('fun@email.com');
+        expect(changeset.content.contact.emails[1].primary).toEqual('primary@email.com');
+        expect(changeset.content.contact.emails).toEqual([
           { primary: 'bob@email.com' },
           { primary: 'primary@email.com', funEmail: 'fun@email.com' }
         ]);
@@ -1355,9 +1365,9 @@ describe('Unit | Utility | changeset', () => {
           }
         ]);
 
-        changeset.set('contact.emails.1.primary', 'primary2@email.com');
+        changeset.content.contact.emails[1].primary = 'primary2@email.com';
 
-        expect(changeset.get('contact.emails.1.primary')).toEqual('primary2@email.com');
+        expect(changeset.content.contact.emails[1].primary).toEqual('primary2@email.com');
         expect(changeset.changes).toEqual([
           {
             key: 'contact.emails.1',
@@ -1365,16 +1375,20 @@ describe('Unit | Utility | changeset', () => {
               primary: 'primary2@email.com',
               funEmail: 'fun@email.com'
             }
+          },
+          {
+            key: 'contact.emails[1].primary',
+            value: 'primary2@email.com'
           }
         ]);
-        expect(changeset.get('contact.emails').unwrap()).toEqual([
+        expect(changeset.content.contact.emails).toEqual([
           { primary: 'bob@email.com' },
           { primary: 'primary2@email.com', funEmail: 'fun@email.com' }
         ]);
       });
 
       it('can edit a new object that was added after deleting an array entry', () => {
-        const changeset = Changeset({
+        const changeset = new Changeset({
           contacts: {
             emails: [
               {
@@ -1389,9 +1403,9 @@ describe('Unit | Utility | changeset', () => {
           }
         });
 
-        changeset.set('contacts.emails.1', null);
+        changeset.content.contacts.emails[1] = null;
 
-        expect(changeset.get('contacts.emails').unwrap()).toEqual([
+        expect(changeset.content.contacts.emails).toEqual([
           {
             fun: 'fun0@email.com',
             primary: 'primary0@email.com'
@@ -1405,17 +1419,17 @@ describe('Unit | Utility | changeset', () => {
   it('#set works for nested when the root key is "value"', () => {
     dummyModel.value = {};
     dummyModel.org = {};
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('value.short', 'foo');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.value.short = 'foo';
 
-    expect(dummyChangeset.get('value.short')).toBe('foo');
+    expect(dummyChangeset.content.value.short).toBe('foo');
     expect(dummyModel.value).toEqual({});
 
     const changes = dummyChangeset.changes;
     const expectedChanges = [{ key: 'value.short', value: 'foo' }];
     expect(changes).toEqual(expectedChanges);
-    expect(dummyChangeset.value).toEqual({ short: 'foo' });
-    expect(dummyChangeset.org).toEqual({});
+    expect(dummyChangeset.content.value).toEqual({ short: 'foo' });
+    expect(dummyChangeset.content.org).toEqual({});
 
     dummyChangeset.execute();
 
@@ -1425,13 +1439,13 @@ describe('Unit | Utility | changeset', () => {
   it('nested objects can be replaced with different ones without changing the nested return values', () => {
     dummyModel['org'] = { usa: { ny: 'ny' } };
 
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('org', { usa: { ca: 'ca' } });
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.org = { usa: { ca: 'ca' } };
 
-    expect(dummyChangeset.get('org')).toEqual({ usa: { ca: 'ca', ny: undefined } });
-    expect(dummyChangeset.get('org.usa')).toEqual({ ca: 'ca', ny: undefined });
-    expect(dummyChangeset.get('org.usa.ca')).toBe('ca');
-    expect(dummyChangeset.get('org.usa.ny')).toBeUndefined();
+    expect(dummyChangeset.content.org).toEqual({ usa: { ca: 'ca', ny: undefined } });
+    expect(dummyChangeset.content.org.usa).toEqual({ ca: 'ca', ny: undefined });
+    expect(dummyChangeset.content.org.usa.ca).toBe('ca');
+    expect(dummyChangeset.content.org.usa.ny).toBeUndefined();
   });
 
   it('nested objects can be replaced with different ones as classes', () => {
@@ -1443,14 +1457,14 @@ describe('Unit | Utility | changeset', () => {
     }
     dummyModel['org'] = new Country({ usa: { ny: 'ny' } });
 
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('org', new Country({ usa: { ca: 'ca' } }));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.org = new Country({ usa: { ca: 'ca' } });
 
-    expect(dummyChangeset.get('org')).toEqual(new Country({ usa: { ca: 'ca', ny: undefined } }));
-    expect(dummyChangeset.get('org.details')).toEqual({ usa: { ca: 'ca', ny: undefined } });
-    expect(dummyChangeset.get('org.details.usa')).toEqual({ ca: 'ca', ny: undefined });
-    expect(dummyChangeset.get('org.details.usa.ca')).toBe('ca');
-    expect(dummyChangeset.get('org.details.usa.ny')).toBeUndefined();
+    expect(dummyChangeset.content.org).toEqual(new Country({ usa: { ca: 'ca', ny: undefined } }));
+    expect(dummyChangeset.content.org.details).toEqual({ usa: { ca: 'ca', ny: undefined } });
+    expect(dummyChangeset.content.org.details.usa).toEqual({ ca: 'ca', ny: undefined });
+    expect(dummyChangeset.content.org.details.usa.ca).toBe('ca');
+    expect(dummyChangeset.content.org.details.usa.ny).toBeUndefined();
   });
 
   it('#set doesnt lose sibling keys', () => {
@@ -1463,25 +1477,25 @@ describe('Unit | Utility | changeset', () => {
       landArea: 100
     };
 
-    const c: Record<string, any> = Changeset(dummyModel);
-    c.set('org.usa.ny', 'NY');
+    const c: Record<string, any> = new Changeset(dummyModel);
+    c.content.org.usa.ny = 'NY';
 
     expect(dummyModel.org.usa.ny).toBe('ny');
     expect(c.org.usa.ny).toBe('NY');
-    expect(c.get('org.usa.ny')).toBe('NY');
-    expect(c.get('org.usa.mn')).toBe('mn');
-    expect(c.get('org.usa.nz')).toBe('nz');
-    expect(c.get('org.landArea')).toBe(100);
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('NY');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('mn');
+    expect(getDeep(c.content, 'org.usa.nz')).toBe('nz');
+    expect(getDeep(c.content, 'org.landArea')).toBe(100);
 
     // set again
-    c.set('org.usa.ny', 'nye');
+    c.content.org.usa.ny = 'nye';
 
     expect(dummyModel.org.usa.ny).toBe('ny');
     expect(c.org.usa.ny).toBe('nye');
-    expect(c.get('org.usa.ny')).toBe('nye');
-    expect(c.get('org.usa.mn')).toBe('mn');
-    expect(c.get('org.usa.nz')).toBe('nz');
-    expect(c.get('org.landArea')).toBe(100);
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('nye');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('mn');
+    expect(getDeep(c.content, 'org.usa.nz')).toBe('nz');
+    expect(getDeep(c.content, 'org.landArea')).toBe(100);
   });
 
   it('#set adds a change if the key is an object', () => {
@@ -1494,15 +1508,15 @@ describe('Unit | Utility | changeset', () => {
       landArea: 100
     };
 
-    const c: any = Changeset(dummyModel);
-    c.set('org.usa.ny', 'NY');
+    const c: any = new Changeset(dummyModel);
+    c.content.org.usa.ny = 'NY';
 
     expect(dummyModel.org.usa.ny).toBe('ny');
     expect(c.org.usa.ny).toBe('NY');
-    expect(c.get('org.usa.ny')).toBe('NY');
-    expect(c.get('org.usa.mn')).toBe('mn');
-    expect(c.get('org.usa.nz')).toBe('nz');
-    expect(c.get('org.landArea')).toBe(100);
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('NY');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('mn');
+    expect(getDeep(c.content, 'org.usa.nz')).toBe('nz');
+    expect(getDeep(c.content, 'org.landArea')).toBe(100);
 
     const expectedChanges = [{ key: 'org.usa.ny', value: 'NY' }];
     const changes = c.changes;
@@ -1510,31 +1524,36 @@ describe('Unit | Utility | changeset', () => {
     expect(changes).toEqual(expectedChanges);
   });
 
-  it('#set use native setters with nested doesnt work', () => {
+  it('#set use native setters with nested', () => {
     dummyModel['org'] = {
       usa: {
         ny: 'ny'
       }
     };
 
-    const c = Changeset(dummyModel);
-    set(c, 'org.usa.ny', 'foo');
+    const c = new Changeset(dummyModel);
+    c.content.org.usa.ny = 'foo';
 
-    expect(dummyModel.org.usa.ny).toBe('foo');
-    expect(c.get('org.usa.ny')).toBe('foo');
+    expect(dummyModel.org.usa.ny).toBe('ny');
+    expect(c.content.org.usa.ny).toBe('foo');
 
     const changes = c.changes;
-    expect(changes).toEqual([]);
+    expect(changes).toEqual([
+      {
+        key: 'org.usa.ny',
+        value: 'foo'
+      }
+    ]);
   });
 
   it('#set use native setters at single level', () => {
     dummyModel.org = 'ny';
 
-    const c = Changeset(dummyModel);
-    c.org = 'foo';
+    const c = new Changeset(dummyModel);
+    c.content.org = 'foo';
 
     expect(dummyModel.org).toBe('ny');
-    expect(c.org).toBe('foo');
+    expect(c.content.org).toBe('foo');
 
     const changes = c.changes;
     expect(changes).toEqual([{ key: 'org', value: 'foo' }]);
@@ -1547,22 +1566,22 @@ describe('Unit | Utility | changeset', () => {
         this.date = date;
       }
     }
-    const c = Changeset(dummyModel);
+    const c = new Changeset(dummyModel);
     const d = new Date();
     const momentInstance = new Moment(d);
-    c.set('startDate', momentInstance);
+    c.content.startDate = momentInstance;
 
     const expectedChanges = [{ key: 'startDate', value: momentInstance }];
     const changes = c.changes;
 
     expect(changes).toEqual(expectedChanges);
 
-    let newValue = c.get('startDate');
+    let newValue = getDeep(c.content, 'startDate');
     expect(newValue.date).toEqual(momentInstance.date);
     expect(newValue instanceof Moment).toBeTruthy();
     expect(newValue.date).toEqual(d);
 
-    newValue = c.startDate;
+    newValue = c.content.startDate;
     expect(newValue.date).toEqual(momentInstance.date);
     expect(newValue instanceof Moment).toBeTruthy();
     expect(newValue.date).toEqual(d);
@@ -1570,28 +1589,28 @@ describe('Unit | Utility | changeset', () => {
 
   it('#set supports `undefined`', () => {
     const model = { name: 'foo' };
-    const dummyChangeset = Changeset(model);
+    const dummyChangeset = new Changeset(model);
 
-    dummyChangeset.set('name', undefined);
-    expect(dummyChangeset.name).toBeUndefined();
+    dummyChangeset.content.name = undefined;
+    expect(dummyChangeset.content.name).toBeUndefined();
     expect(dummyChangeset.changes).toEqual([{ key: 'name', value: undefined }]);
   });
 
   it('#set does not add a change if new value equals old value', () => {
     const model = { name: 'foo' };
-    const dummyChangeset = Changeset(model);
+    const dummyChangeset = new Changeset(model);
 
-    dummyChangeset.set('name', 'foo');
+    dummyChangeset.content.name = 'foo';
     expect(dummyChangeset.changes).toEqual([]);
   });
 
   it('#set does not add a change if new value equals old value and `skipValidate` is true', () => {
     const model = { name: 'foo' };
-    const dummyChangeset = Changeset(model, null, null, { skipValidate: true });
+    const dummyChangeset = new Changeset(model, null, null, { skipValidate: true });
 
     expect(dummyChangeset.isValid).toEqual(true);
 
-    dummyChangeset.set('name', 'foo');
+    dummyChangeset.content.name = 'foo';
 
     expect(dummyChangeset.changes).toEqual([]);
     expect(dummyChangeset.isValid).toEqual(true);
@@ -1599,24 +1618,23 @@ describe('Unit | Utility | changeset', () => {
 
   it('#set removes a change if set back to original value', () => {
     const model = { name: 'foo' };
-    const dummyChangeset = Changeset(model);
+    const dummyChangeset = new Changeset(model);
 
-    dummyChangeset.set('name', 'bar');
+    dummyChangeset.content.name = 'bar';
     expect(dummyChangeset.changes).toEqual([{ key: 'name', value: 'bar' }]);
 
-    dummyChangeset.set('name', 'foo');
+    dummyChangeset.content.name = 'foo';
     expect(dummyChangeset.changes).toEqual([]);
   });
 
   it('#set removes a change if set back to original value in nested context', () => {
     const model = { name: { email: 'foo' } };
-    const dummyChangeset = Changeset(model);
-    dummyChangeset.safeGet = get;
+    const dummyChangeset = new Changeset(model);
 
-    dummyChangeset.set('name.email', 'bar');
+    dummyChangeset.content.name.email = 'bar';
     expect(dummyChangeset.changes).toEqual([{ key: 'name.email', value: 'bar' }]);
 
-    dummyChangeset.set('name.email', 'foo');
+    dummyChangeset.content.name.email = 'foo';
     expect(dummyChangeset.changes).toEqual([]);
   });
 
@@ -1625,9 +1643,9 @@ describe('Unit | Utility | changeset', () => {
       { key: 'name', validation: 'too short', value: 'a' },
       { key: 'password', validation: ['foo', 'bar'], value: false }
     ];
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'a');
-    dummyChangeset.set('password', false);
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'a';
+    dummyChangeset.content.password = false;
     const changes = dummyChangeset.changes;
     const errors = dummyChangeset.errors;
     const isValid = dummyChangeset.isValid;
@@ -1646,44 +1664,44 @@ describe('Unit | Utility | changeset', () => {
   it('#set adds the change without validation if `skipValidate` option is set', () => {
     const expectedChanges = [{ key: 'password', value: false }];
 
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), null, {
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations), null, {
       skipValidate: true
     });
 
-    expect(dummyChangeset.isValid).toEqual(true);
+    expect(dummyChangeset.content.isValid).toEqual(true);
 
-    dummyChangeset.set('password', false);
+    dummyChangeset.content.password = false;
     const changes = dummyChangeset.changes;
 
     expect(changes).toEqual(expectedChanges);
-    expect(dummyChangeset.isValid).toEqual(true);
+    expect(dummyChangeset.content.isValid).toEqual(true);
   });
 
   it('#set adds errors if undefined value', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedResult = [{ key: 'name', validation: 'too short', value: undefined }];
-    dummyChangeset.set('name', undefined);
+    dummyChangeset.content.name = undefined;
 
-    expect(dummyChangeset.errors).toEqual(expectedResult);
-    expect(dummyChangeset.get('errors')).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
   });
 
   it('#set if trigger null value', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedResult = [{ key: 'name', validation: 'too short', value: null }];
-    dummyChangeset.set('name', null);
+    dummyChangeset.content.name = null;
 
-    expect(dummyChangeset.errors).toEqual(expectedResult);
-    expect(dummyChangeset.get('errors')).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
   });
 
   it('#set if trigger empty string value', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedResult = [{ key: 'name', validation: 'too short', value: '' }];
-    dummyChangeset.set('name', '');
+    dummyChangeset.content.name = '';
 
-    expect(dummyChangeset.errors).toEqual(expectedResult);
-    expect(dummyChangeset.get('errors')).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
+    expect(dummyChangeset.content.errors).toEqual(expectedResult);
   });
 
   it('#set should remove nested changes when setting roots', () => {
@@ -1694,10 +1712,10 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    const c = Changeset(dummyModel);
-    c.set('org.usa.ny', 'foo');
-    c.set('org.usa.ca', 'bar');
-    c.set('org', 'no usa for you');
+    const c = new Changeset(dummyModel);
+    c.content.org.usa.ny = 'foo';
+    c.content.org.usa.ca = 'bar';
+    c.content.org = 'no usa for you';
 
     const actual = c.changes;
     const expectedResult = [{ key: 'org', value: 'no usa for you' }];
@@ -1712,14 +1730,14 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    const c = Changeset(dummyModel);
-    c.set('org', {
+    const c = new Changeset(dummyModel);
+    c.content.org = {
       isCompliant: true,
       usa: {
         ca: 'il',
         ny: 'wi'
       }
-    });
+    };
 
     let actual = c.changes;
     let expectedResult = [
@@ -1737,7 +1755,7 @@ describe('Unit | Utility | changeset', () => {
 
     expect(actual).toEqual(expectedResult);
 
-    c.set('org.isCompliant', false);
+    c.content.org.isCompliant = false;
 
     actual = c.changes;
     expectedResult = [
@@ -1766,48 +1784,48 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    const c = Changeset(dummyModel);
-    c.set('org.usa.ny', 'NY');
-    c.set('org.usa.mn', 'MN');
+    const c = new Changeset(dummyModel);
+    c.content.org.usa.ny = 'NY';
+    c.content.org.usa.mn = 'MN';
 
-    expect(c.get('org.usa.ny')).toBe('NY');
-    expect(c.get('org.usa.mn')).toBe('MN');
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('NY');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('MN');
     expect(dummyModel.org.usa.ny).toBe('ny');
     expect(dummyModel.org.usa.mn).toBe('mn');
 
-    c.save();
+    c.applyTo(dummyModel);
 
-    expect(c.get('org.usa.ny')).toBe('NY');
-    expect(c.get('org.usa.mn')).toBe('MN');
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('NY');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('MN');
     expect(dummyModel.org.usa.ny).toBe('NY');
     expect(dummyModel.org.usa.mn).toBe('MN');
 
-    c.set('org.usa.ny', 'nil');
+    c.content.org.usa.ny = 'nil';
 
-    expect(c.get('org.usa.ny')).toBe('nil');
-    expect(c.get('org.usa.mn')).toBe('MN');
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('nil');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('MN');
     expect(dummyModel.org.usa.ny).toBe('NY');
     expect(dummyModel.org.usa.mn).toBe('MN');
 
-    c.save();
+    c.applyTo(dummyModel);
 
-    expect(c.get('org.usa.ny')).toBe('nil');
-    expect(c.get('org.usa.mn')).toBe('MN');
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('nil');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('MN');
     expect(dummyModel.org.usa.ny).toBe('nil');
     expect(dummyModel.org.usa.mn).toBe('MN');
 
-    c.set('org.usa.ny', 'nil2');
-    c.set('org.usa.mn', 'undefined');
+    c.content.org.usa.ny = 'nil2';
+    c.content.org.usa.mn = 'undefined';
 
-    expect(c.get('org.usa.ny')).toBe('nil2');
-    expect(c.get('org.usa.mn')).toBe('undefined');
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('nil2');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('undefined');
     expect(dummyModel.org.usa.ny).toBe('nil');
     expect(dummyModel.org.usa.mn).toBe('MN');
 
-    c.save();
+    c.applyTo(dummyModel);
 
-    expect(c.get('org.usa.ny')).toBe('nil2');
-    expect(c.get('org.usa.mn')).toBe('undefined');
+    expect(getDeep(c.content, 'org.usa.ny')).toBe('nil2');
+    expect(getDeep(c.content, 'org.usa.mn')).toBe('undefined');
     expect(dummyModel.org.usa.ny).toBe('nil2');
     expect(dummyModel.org.usa.mn).toBe('undefined');
   });
@@ -1841,11 +1859,11 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    const changeset = Changeset(resource);
+    const changeset = new Changeset(resource);
 
-    changeset.set('styles.colors.main.sync', false);
+    changeset.content.styles.colors.main.sync = false;
 
-    const result = changeset.get('styles.colors.main');
+    const result = changeset.content.styles.colors.main;
     expect(result.sync).toEqual(false);
   });
 
@@ -1859,77 +1877,81 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    expect(dummyChangeset.get('org.asia.sg')).toBe('_initial');
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    expect(dummyChangeset.content.org.asia.sg).toBe('_initial');
 
-    dummyChangeset.set('org.asia.sg', 'sg');
-    expect(dummyChangeset.get('org.asia.sg')).toBe('sg');
+    dummyChangeset.content.org.asia.sg = 'sg';
+    expect(dummyChangeset.content.org.asia.sg).toBe('sg');
 
-    dummyChangeset.get('org.asia').set('sg', 'SG');
-    expect(dummyChangeset.get('org.asia.sg')).toBe('SG');
+    dummyChangeset.content.org.asia.set('sg', 'SG');
+    expect(dummyChangeset.content.org.asia.sg).toBe('SG');
 
-    dummyChangeset.get('org').set('asia.sg', 'sg');
-    expect(dummyChangeset.get('org.asia.sg')).toBe('sg');
+    dummyChangeset.content.org.set('asia.sg', 'sg');
+    expect(dummyChangeset.content.org.asia.sg).toBe('sg');
 
-    expect(dummyChangeset.get('org').get('asia.sg')).toBe('sg');
+    expect(dummyChangeset.content.org.getDeep('asia.sg')).toBe('sg');
   });
 
   it('it accepts async validations', async () => {
     delete dummyModel.save;
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
     const expectedChanges = [{ key: 'async', value: true }];
-    const expectedError = { async: { validation: 'is invalid', value: 'is invalid' } };
+    const expectedError = { validation: 'is invalid', value: 'is invalid' };
 
-    dummyChangeset.set('async', true);
+    dummyChangeset.content.async = true;
     expect(dummyChangeset.changes).toEqual(expectedChanges);
 
-    dummyChangeset.set('async', 'is invalid');
-    expect(dummyChangeset.error).toEqual({});
+    dummyChangeset.content.async = 'is invalid';
+    expect(dummyChangeset.content.error).toEqual({});
 
     await dummyChangeset.validate();
-    expect(dummyChangeset.error).toEqual(expectedError);
+    expect(dummyChangeset.content.error.async).toEqual(expectedError);
 
-    await dummyChangeset.save();
+    await dummyChangeset.applyTo(dummyModel);
     // save clears errors
-    expect(dummyChangeset.error).toEqual({});
+    expect(dummyChangeset.content.error).toEqual({});
   });
 
   it('it clears errors when setting to original value', () => {
     dummyModel.name = 'Jim Bob';
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', '');
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = '';
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(dummyChangeset.isValid).toEqual(false);
-    dummyChangeset.set('name', 'Jim Bob');
-    expect(dummyChangeset.isValid).toEqual(true);
-    expect(dummyChangeset.isInvalid).toEqual(false);
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(dummyChangeset.content.isValid).toEqual(false);
+    dummyChangeset.content.name = 'Jim Bob';
+    expect(dummyChangeset.content.isValid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(false);
   });
 
   it('it clears errors when setting to original value when nested', async () => {
-    set(dummyModel, 'org', {
+    dummyModel.org = {
       usa: { ny: 'vaca' }
-    });
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('org.usa.ny', '');
+    };
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.org.usa.ny = '';
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    dummyChangeset.set('org.usa.ny', 'vaca');
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    dummyChangeset.content.org.usa.ny = 'vaca';
     expect(dummyChangeset.isValid).toBeTruthy();
-    expect(dummyChangeset.isInvalid).toEqual(false);
+    expect(dummyChangeset.content.isInvalid).toEqual(false);
   });
 
   test('it clears errors when setting to original value when nested Booleans', async () => {
-    set(dummyModel, 'org', {
+    dummyModel.org = {
       isCompliant: true
-    });
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('org.isCompliant', false);
+    };
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.org.isCompliant = false;
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    dummyChangeset.set('org.isCompliant', true);
-    expect(dummyChangeset.isValid).toEqual(true);
-    expect(dummyChangeset.isInvalid).toEqual(false);
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    dummyChangeset.content.org.isCompliant = true;
+    expect(dummyChangeset.content.isValid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(false);
   });
 
   it('#set should delete nested changes when equal', () => {
@@ -1937,10 +1959,10 @@ describe('Unit | Utility | changeset', () => {
       usa: { ny: 'i need a vacation' }
     };
 
-    const c = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
-    c.set('org.usa.br', 'whoop');
+    const c = new Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    c.content.org.usa.br = 'whoop';
 
-    const actual = get(c, 'change.org.usa.ny');
+    const actual = getDeep(c, 'change.org.usa.ny');
     const expectedResult = undefined;
     expect(actual).toEqual(expectedResult);
   });
@@ -1948,12 +1970,12 @@ describe('Unit | Utility | changeset', () => {
   it('#set works when replacing an Object with an primitive', () => {
     const model = { foo: { bar: { baz: 42 } } };
 
-    const c: any = Changeset(model);
+    const c: any = new Changeset(model);
     expect(c.foo.bar.baz).toEqual(model.foo.bar.baz);
 
-    c.set('foo', 'not an object anymore');
+    c.content.foo = 'not an object anymore';
     c.execute();
-    expect(c.get('foo')).toEqual(model.foo);
+    expect(getDeep(c.content, 'foo')).toEqual(model.foo);
   });
 
   /**
@@ -1962,9 +1984,11 @@ describe('Unit | Utility | changeset', () => {
 
   it('#prepare provides callback to modify changes', () => {
     const date = new Date();
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('first_name', 'foo');
-    dummyChangeset.set('date_of_birth', date);
+    const dummyChangeset = new Changeset(dummyModel);
+    // eslint-disable-next-line
+    dummyChangeset.content.first_name = 'foo';
+    // eslint-disable-next-line
+    dummyChangeset.content.date_of_birth = date;
     dummyChangeset.prepare(changes => {
       const modified: Record<string, any> = {};
 
@@ -1974,25 +1998,29 @@ describe('Unit | Utility | changeset', () => {
 
       return modified;
     });
-    const changeKeys = dummyChangeset.changes.map(change => get(change, 'key'));
+    const changeKeys = dummyChangeset.changes.map(change => getDeep(change, 'key'));
 
-    expect(changeKeys).toEqual(['first-name', 'date-of-birth']);
+    expect(changeKeys).toContain('date-of-birth');
+    expect(changeKeys).toContain('first-name');
+    expect(changeKeys).not.toContain('date_of_birth');
+    expect(changeKeys).not.toContain('first_name');
     dummyChangeset.execute();
     expect(dummyModel['first-name']).toEqual('foo');
     expect(dummyModel['date-of-birth']).toEqual(date);
   });
 
   it('#prepare throws if callback does not return object', () => {
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('first_name', 'foo');
+    const dummyChangeset = new Changeset(dummyModel);
+    // eslint-disable-next-line
+    dummyChangeset.content.first_name = 'foo';
 
     expect(() => dummyChangeset.prepare(() => null)).toThrow();
   });
 
   it('#prepare works with initial model containing an object property', () => {
-    const dummyChangeset = Changeset({ obj: {} });
+    const dummyChangeset = new Changeset({ obj: {} });
 
-    dummyChangeset.get('obj').unwrap();
+    dummyChangeset.content.obj;
     dummyChangeset.prepare(function(changes) {
       return changes;
     });
@@ -2005,8 +2033,8 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#execute applies changes to content if valid', () => {
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'foo');
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.name = 'foo';
 
     expect(dummyModel.name).toBeUndefined();
     expect(dummyChangeset.isValid).toBeTruthy();
@@ -2017,8 +2045,8 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#execute does not apply changes to content if invalid', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'a');
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'a';
 
     expect(dummyModel.name).toBeUndefined();
     expect(dummyChangeset.isInvalid).toBeTruthy();
@@ -2033,10 +2061,10 @@ describe('Unit | Utility | changeset', () => {
     const originalProto = Object.getPrototypeOf(dog);
 
     const model: Record<string, any> = {};
-    const c = Changeset(model);
-    c.set('dog', dog);
+    const c = new Changeset(model);
+    c.content.dog = dog;
 
-    const condition = c.dog instanceof DogTag;
+    const condition = c.content.dog instanceof DogTag;
     expect(condition).toBeTruthy();
 
     c.execute();
@@ -2054,8 +2082,8 @@ describe('Unit | Utility | changeset', () => {
     dog.info.name = 'mishka';
     dog.info.breed = 'husky';
 
-    const c = Changeset(dog);
-    c.set('info.name', 'laika');
+    const c = new Changeset(dog);
+    c.content.info.name = 'laika';
 
     c.execute();
 
@@ -2095,9 +2123,9 @@ describe('Unit | Utility | changeset', () => {
   ].forEach(({ model, setCalls, result }, i) => {
     it(`#execute - table-driven test ${i + 1}`, () => {
       const m = model();
-      const c = Changeset(m);
+      const c = new Changeset(m);
 
-      setCalls.forEach(([k, v]) => c.set(k, v));
+      setCalls.forEach(([k, v]) => (c[k] = v));
       c.execute();
 
       const actual = m;
@@ -2126,14 +2154,17 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('org.asia.sg', 'sg');
-    dummyChangeset.set('org.usa.ca', 'ca');
-    dummyChangeset.set('org.usa.ny', 'ny');
-    dummyChangeset.set('org.usa.ma', { name: 'Massachusetts' });
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.org.asia.sg = 'sg';
+    dummyChangeset.content.org.usa.ca = 'ca';
+    dummyChangeset.content.org.usa.ny = 'ny';
+    dummyChangeset.content.org.usa.ma = { name: 'Massachusetts' };
     dummyChangeset.execute();
-    expect(dummyChangeset.change).toEqual({});
-    expect(get(dummyChangeset, '_content.org')).toEqual(expectedResult.org);
+    expect(dummyChangeset.content.change).toEqual({});
+    expect(dummyChangeset.content._content.org.asia.sg).toEqual(expectedResult.org.asia.sg);
+    expect(dummyChangeset.content._content.org.usa.ca).toEqual(expectedResult.org.usa.ca);
+    expect(dummyChangeset.content._content.org.usa.ny).toEqual(expectedResult.org.usa.ny);
+    expect(dummyChangeset.content._content.org.usa.ma.name).toEqual(expectedResult.org.usa.ma.name);
     expect(dummyModel.org).toEqual(expectedResult.org);
   });
 
@@ -2142,7 +2173,7 @@ describe('Unit | Utility | changeset', () => {
 
     const dog: any = {};
 
-    const c = Changeset(dog);
+    const c = new Changeset(dog);
     function callback() {
       expect(true).toBeTruthy();
     }
@@ -2157,9 +2188,9 @@ describe('Unit | Utility | changeset', () => {
     dummyModel.size = {
       value: 0
     };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('size.value', 1001);
-    dummyChangeset.set('size.power10', 10);
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.size.value = 1001;
+    dummyChangeset.content.size.power10 = 10;
 
     expect(dummyModel.size.value).toEqual(0);
     expect(dummyModel.size.power10).toBeUndefined();
@@ -2172,8 +2203,8 @@ describe('Unit | Utility | changeset', () => {
 
   it('#execute works if leaf property wasnt set before', () => {
     dummyModel.size = {};
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('size.value', 1001);
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.size.value = 1001;
 
     expect(dummyModel.size).toEqual({});
 
@@ -2184,8 +2215,8 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#execute works if root property wasnt set before', () => {
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('size.value', 1001);
+    const dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.size.value = 1001;
 
     expect(dummyModel.size).toBeUndefined();
 
@@ -2196,17 +2227,17 @@ describe('Unit | Utility | changeset', () => {
   });
 
   test('execute returns correct object after setting value on empty initial object', async function() {
-    let c = Changeset({});
+    let c = new Changeset({});
 
-    c.set('country', 'usa');
+    (c.content as any).country = 'usa';
 
-    expect(c.execute().data).toEqual({
+    expect(c.execute().content).toEqual({
       country: 'usa'
     });
 
-    c.set('org.usa.ny', 'any value');
+    (c.content as any).org.usa.ny = 'any value';
 
-    expect(c.execute().data).toEqual({
+    expect(c.execute().content).toEqual({
       country: 'usa',
       org: {
         usa: {
@@ -2214,9 +2245,9 @@ describe('Unit | Utility | changeset', () => {
         }
       }
     });
-    c.set('org.usa.il', '2nd value');
+    (c.content as any).org.usa.il = '2nd value';
 
-    expect(c.execute().data).toEqual({
+    expect(c.execute().content).toEqual({
       country: 'usa',
       org: {
         usa: {
@@ -2231,129 +2262,102 @@ describe('Unit | Utility | changeset', () => {
    * #save
    */
 
-  it('#save proxies to content', done => {
-    let result;
-    let options;
-    dummyModel.save = (dummyOptions: Record<string, any>) => {
-      result = 'ok';
-      options = dummyOptions;
-      return Promise.resolve('saveResult');
-    };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'foo');
-
-    expect(result).toBeUndefined();
-    const promise = dummyChangeset.save({ foo: 'test options' });
-    expect(result).toEqual('ok');
-    expect(dummyChangeset.change).toEqual({});
-    expect(options).toEqual({ foo: 'test options' });
-    expect(!!promise && typeof promise.then === 'function').toBeTruthy();
-    promise
-      .then(saveResult => {
-        expect(saveResult).toEqual('saveResult');
-      })
-      .finally(() => done());
-  });
-
-  it('#save handles non-promise proxy content', done => {
-    let result;
-    let options;
-    dummyModel.save = (dummyOptions: Record<string, any>) => {
-      result = 'ok';
-      options = dummyOptions;
-      return Promise.resolve('saveResult');
-    };
-    const dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'foo');
-
-    expect(result).toBe(undefined);
-    const promise = dummyChangeset.save({ foo: 'test options' });
-    expect(result).toBe('ok');
-    expect(options).toEqual({ foo: 'test options' });
-    expect(!!promise && typeof promise.then === 'function').toBeTruthy();
-    promise
-      .then(saveResult => {
-        expect(saveResult).toBe('saveResult');
-      })
-      .finally(() => done());
-  });
-
-  it('#save handles rejected proxy content', done => {
-    expect.assertions(1);
-
-    const dummyChangeset = Changeset(dummyModel);
-
-    dummyModel['save'] = () => {
-      return Promise.reject(new Error('some ember data error'));
-    };
-
-    dummyChangeset
-      .save()
-      .then(() => {
-        expect(false).toBeTruthy();
-      })
-      .catch(error => {
-        expect(error.message).toEqual('some ember data error');
-      })
-      .finally(() => done());
-  });
-
-  it('#save restores values on content after rejected Promise if user calls unexecute', done => {
-    expect.assertions(2);
-
-    dummyModel.name = 'previous';
-    const dummyChangeset = Changeset(dummyModel);
-
-    dummyModel['save'] = () => {
-      dummyModel.errors = [
-        {
-          message: 'oops I did it again'
-        }
-      ];
-      return Promise.reject(new Error('some ember data error'));
-    };
-
-    dummyChangeset.set('name', 'new');
-
-    dummyChangeset
-      .save()
-      .then(() => {
-        expect(false).toBeTruthy();
-      })
-      .catch(() => {
-        dummyChangeset.unexecute();
-      })
-      .finally(() => {
-        expect(dummyModel.name).toEqual('previous');
-        expect(dummyModel.errors).toEqual([
-          {
-            message: 'oops I did it again'
-          }
-        ]);
-        done();
-      });
-  });
-
-  it('#save proxies to content even if it does not implement #save', done => {
-    const person = { name: 'Jim' };
-    const dummyChangeset = Changeset(person);
-    dummyChangeset.set('name', 'foo');
-
-    return dummyChangeset.save().then(() => {
-      expect(person.name).toBe('foo');
-      done();
-    });
-  });
+  // it('#save handles non-promise proxy content', async () => {
+  //   let result;
+  //   let options;
+  //   dummyModel.save = (dummyOptions: Record<string, any>) => {
+  //     result = 'ok';
+  //     options = dummyOptions;
+  //     return Promise.resolve('saveResult');
+  //   };
+  //   const dummyChangeset = new Changeset(dummyModel);
+  //   dummyChangeset.content.name =  'foo';
+
+  //   expect(result).toBe(undefined);
+  //   const promise = dummyChangeset.save({ foo: 'test options' });
+  //   expect(result).toBe('ok');
+  //   expect(options).toEqual({ foo: 'test options' });
+  //   expect(!!promise && typeof promise.then === 'function').toBeTruthy();
+  //   let saveResult = await promise;
+  //   expect(saveResult).toBe('saveResult');
+  // });
+
+  // it('#save handles rejected proxy content', done => {
+  //   expect.assertions(1);
+
+  //   const dummyChangeset = new Changeset(dummyModel);
+
+  //   dummyModel['save'] = () => {
+  //     return Promise.reject(new Error('some ember data error'));
+  //   };
+
+  //   dummyChangeset
+  //     .save()
+  //     .then(() => {
+  //       expect(false).toBeTruthy();
+  //     })
+  //     .catch(error => {
+  //       expect(error.message).toEqual('some ember data error');
+  //     })
+  //     .finally(() => done());
+  // });
+
+  // it('#save restores values on content after rejected Promise if user calls unexecute', done => {
+  //   expect.assertions(2);
+
+  //   dummyModel.name = 'previous';
+  //   const dummyChangeset = new Changeset(dummyModel);
+
+  //   dummyModel['save'] = () => {
+  //     dummyModel.errors = [
+  //       {
+  //         message: 'oops I did it again'
+  //       }
+  //     ];
+  //     return Promise.reject(new Error('some ember data error'));
+  //   };
+
+  //   dummyChangeset.content.name =  'new';
+
+  //   dummyChangeset
+  //     .save()
+  //     .then(() => {
+  //       expect(false).toBeTruthy();
+  //     })
+  //     .catch(() => {
+  //       dummyChangeset.unexecute();
+  //     })
+  //     .finally(() => {
+  //       expect(dummyModel.name).toEqual('previous');
+  //       expect(dummyModel.errors).toEqual([
+  //         {
+  //           message: 'oops I did it again'
+  //         }
+  //       ]);
+  //       done();
+  //     });
+  // });
+
+  // it('#save proxies to content even if it does not implement #save', done => {
+  //   const person = { name: 'Jim' };
+  //   const dummyChangeset = new Changeset(person);
+  //   dummyChangeset.content.name =  'foo';
+
+  //   return dummyChangeset.save().then(() => {
+  //     expect(person.name).toBe('foo');
+  //     done();
+  //   });
+  // });
 
   /**
    * #merge
    */
 
   it('#merge merges 2 valid changesets', () => {
-    const dummyChangesetA = Changeset(dummyModel);
-    const dummyChangesetB = Changeset(dummyModel);
-    dummyChangesetA.set('firstName', 'Jim');
-    dummyChangesetB.set('lastName', 'Bob');
+    const dummyChangesetA = new Changeset(dummyModel);
+    const dummyChangesetB = new Changeset(dummyModel);
+    dummyChangesetA.content.firstName = 'Jim';
+    dummyChangesetB.content.lastName = 'Bob';
     const dummyChangesetC = dummyChangesetA.merge(dummyChangesetB);
     const expectedChanges = [
       { key: 'firstName', value: 'Jim' },
@@ -2366,13 +2370,13 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#merge merges invalid changesets', () => {
-    const dummyChangesetA = Changeset(dummyModel, lookupValidator(dummyValidations));
-    const dummyChangesetB = Changeset(dummyModel, lookupValidator(dummyValidations));
-    const dummyChangesetC = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangesetA.set('age', 21);
-    dummyChangesetA.set('name', 'a');
-    dummyChangesetB.set('name', 'Tony Stark');
-    dummyChangesetC.set('name', 'b');
+    const dummyChangesetA = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangesetB = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangesetC = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangesetA.content.age = 21;
+    dummyChangesetA.content.name = 'a';
+    dummyChangesetB.content.name = 'Tony Stark';
+    dummyChangesetC.content.name = 'b';
 
     let dummyChangesetD = dummyChangesetA.merge(dummyChangesetB);
     dummyChangesetD = dummyChangesetD.merge(dummyChangesetC);
@@ -2392,32 +2396,32 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#merge does not merge a changeset with a non-changeset', () => {
-    const dummyChangesetA = Changeset(dummyModel, lookupValidator(dummyValidations));
-    const dummyChangesetB = Changeset({ _changes: { name: 'b' } });
-    dummyChangesetA.set('name', 'a');
+    const dummyChangesetA = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangesetB = new Changeset({ _changes: { name: 'b' } });
+    dummyChangesetA.content.name = 'a';
 
     expect(() => dummyChangesetA.merge(dummyChangesetB)).toThrow();
   });
 
   it('#merge does not merge a changeset with different content', () => {
-    let dummyChangesetA = Changeset(dummyModel, lookupValidator(dummyValidations));
-    let dummyChangesetB = Changeset({}, lookupValidator(dummyValidations));
+    let dummyChangesetA = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangesetB = new Changeset({}, lookupValidator(dummyValidations));
 
     expect(() => dummyChangesetA.merge(dummyChangesetB)).toThrow();
   });
 
   it('#merge preserves content and validator of origin changeset', async () => {
     delete dummyModel.save;
-    let dummyChangesetA = Changeset(dummyModel, lookupValidator(dummyValidations));
-    let dummyChangesetB = Changeset(dummyModel);
+    let dummyChangesetA = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangesetB = new Changeset(dummyModel);
     let dummyChangesetC = dummyChangesetA.merge(dummyChangesetB);
     let expectedErrors = [{ key: 'name', validation: 'too short', value: 'a' }];
 
-    dummyChangesetC.set('name', 'a');
-    expect(dummyChangesetC.get('errors')).toEqual(expectedErrors);
+    dummyChangesetC.content.name = 'a';
+    expect(dummyChangesetC.errors).toEqual(expectedErrors);
 
-    dummyChangesetC.set('name', 'Jim Bob');
-    await dummyChangesetC.save();
+    dummyChangesetC.content.name = 'Jim Bob';
+    await dummyChangesetC.applyTo(dummyModel);
 
     expect(dummyModel.name).toBe('Jim Bob');
   });
@@ -2427,29 +2431,26 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#rollback restores old values', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' },
       { key: 'name', value: '' }
     ];
-    let expectedErrors = [{ key: 'name', validation: 'too short', value: '' }];
-    dummyChangeset.set('firstName', 'foo');
-    dummyChangeset.set('lastName', 'bar');
-    dummyChangeset.set('name', '');
+    dummyChangeset.content.firstName = 'foo';
+    dummyChangeset.content.lastName = 'bar';
+    dummyChangeset.content.name = '';
 
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
     expect(dummyChangeset.isDirty).toBe(true);
     dummyChangeset.rollback();
     expect(dummyChangeset.changes).toEqual([]);
-    expect(dummyChangeset.errors).toEqual([]);
     expect(dummyChangeset.isDirty).toBe(false);
   });
 
   it('#rollback resets valid state', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'a');
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'a';
 
     expect(dummyChangeset.isInvalid).toBeTruthy();
     expect(dummyChangeset.isDirty).toBe(true);
@@ -2459,15 +2460,15 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#rollback twice works', () => {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('name', 'abcde');
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.name = 'abcde';
 
     let expectedChanges = [{ key: 'name', value: 'abcde' }];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
     dummyChangeset.rollback();
     expect(dummyChangeset.changes).toEqual([]);
 
-    dummyChangeset.set('name', 'mnop');
+    dummyChangeset.content.name = 'mnop';
     expectedChanges = [{ key: 'name', value: 'mnop' }];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
     expect(dummyChangeset.isDirty).toBe(true);
@@ -2480,15 +2481,15 @@ describe('Unit | Utility | changeset', () => {
     dummyModel['org'] = {
       asia: { sg: null }
     };
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('org.asia.sg', 'sg');
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.org.asia.sg = 'sg';
 
     let expectedChanges = [{ key: 'org.asia.sg', value: 'sg' }];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
     dummyChangeset.rollback();
     expect(dummyChangeset.changes).toEqual([]);
 
-    dummyChangeset.set('org.asia.sg', 'Singapore');
+    dummyChangeset.content.org.asia.sg = 'Singapore';
     expectedChanges = [{ key: 'org.asia.sg', value: 'Singapore' }];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
     dummyChangeset.rollback();
@@ -2496,47 +2497,47 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#rollbackInvalid clears errors and keeps valid values', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' },
       { key: 'name', value: '' }
     ];
     let expectedErrors = [{ key: 'name', validation: 'too short', value: '' }];
-    dummyChangeset.set('firstName', 'foo');
-    dummyChangeset.set('lastName', 'bar');
-    dummyChangeset.set('name', '');
+    dummyChangeset.content.firstName = 'foo';
+    dummyChangeset.content.lastName = 'bar';
+    dummyChangeset.content.name = '';
 
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
     dummyChangeset.rollbackInvalid();
     expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' }
     ];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual([]);
+    expect(dummyChangeset.content.errors).toEqual([]);
   });
 
   it('#rollbackInvalid a specific key clears key error and keeps valid values', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' },
-      { key: 'password', value: false },
-      { key: 'name', value: '' }
+      { key: 'name', value: '' },
+      { key: 'password', value: false }
     ];
     let expectedErrors = [
-      { key: 'password', validation: ['foo', 'bar'], value: false },
-      { key: 'name', validation: 'too short', value: '' }
+      { key: 'name', validation: 'too short', value: '' },
+      { key: 'password', validation: ['foo', 'bar'], value: false }
     ];
-    dummyChangeset.set('firstName', 'foo');
-    dummyChangeset.set('lastName', 'bar');
-    dummyChangeset.set('password', false);
-    dummyChangeset.set('name', '');
+    dummyChangeset.content.firstName = 'foo';
+    dummyChangeset.content.lastName = 'bar';
+    dummyChangeset.content.password = false;
+    dummyChangeset.content.name = '';
 
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
     dummyChangeset.rollbackInvalid('name');
     expectedChanges = [
       { key: 'firstName', value: 'foo' },
@@ -2545,12 +2546,12 @@ describe('Unit | Utility | changeset', () => {
     ];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
     expectedErrors = [{ key: 'password', validation: ['foo', 'bar'], value: false }];
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
   });
 
   it('#rollbackInvalid resets valid state', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'a');
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'a';
 
     expect(dummyChangeset.isInvalid).toBeTruthy();
     dummyChangeset.rollbackInvalid();
@@ -2558,8 +2559,8 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#rollbackInvalid will not remove changes that are valid', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'abcd');
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'abcd';
 
     let expectedChanges = [{ key: 'name', value: 'abcd' }];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
@@ -2570,72 +2571,72 @@ describe('Unit | Utility | changeset', () => {
   });
 
   it('#rollbackInvalid works for keys not on changeset', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' },
       { key: 'name', value: '' }
     ];
     let expectedErrors = [{ key: 'name', validation: 'too short', value: '' }];
-    dummyChangeset.set('firstName', 'foo');
-    dummyChangeset.set('lastName', 'bar');
-    dummyChangeset.set('name', '');
+    dummyChangeset.content.firstName = 'foo';
+    dummyChangeset.content.lastName = 'bar';
+    dummyChangeset.content.name = '';
 
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
     dummyChangeset.rollbackInvalid('dowat?');
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
   });
 
   it('#rollbackProperty restores old value for specified property only', () => {
     dummyModel.firstName = 'Jim';
     dummyModel.lastName = 'Bob';
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedChanges = [{ key: 'lastName', value: 'bar' }];
-    dummyChangeset.set('firstName', 'foo');
-    dummyChangeset.set('lastName', 'bar');
+    dummyChangeset.content.firstName = 'foo';
+    dummyChangeset.content.lastName = 'bar';
 
     dummyChangeset.rollbackProperty('firstName');
     expect(dummyChangeset.changes).toEqual(expectedChanges);
   });
 
   it('#rollbackProperty clears errors for specified property', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
     let expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' },
       { key: 'name', value: '' }
     ];
     let expectedErrors = [{ key: 'name', validation: 'too short', value: '' }];
-    dummyChangeset.set('firstName', 'foo');
-    dummyChangeset.set('lastName', 'bar');
-    dummyChangeset.set('name', '');
+    dummyChangeset.content.firstName = 'foo';
+    dummyChangeset.content.lastName = 'bar';
+    dummyChangeset.content.name = '';
 
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual(expectedErrors);
+    expect(dummyChangeset.content.errors).toEqual(expectedErrors);
     dummyChangeset.rollbackProperty('name');
     expectedChanges = [
       { key: 'firstName', value: 'foo' },
       { key: 'lastName', value: 'bar' }
     ];
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.errors).toEqual([]);
+    expect(dummyChangeset.content.errors).toEqual([]);
   });
 
   it('#rollbackProperty resets valid state', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
 
-    expect(dummyChangeset.isInvalid).toEqual(false);
-    expect(dummyChangeset.isValid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(false);
+    expect(dummyChangeset.content.isValid).toEqual(true);
 
-    dummyChangeset.set('name', 'a');
+    dummyChangeset.content.name = 'a';
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
 
     dummyChangeset.rollbackProperty('name');
 
-    expect(dummyChangeset.isValid).toEqual(true);
+    expect(dummyChangeset.content.isValid).toEqual(true);
   });
 
   it('can update nested keys after rollback changes.', () => {
@@ -2656,16 +2657,16 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('org.asia.sg', 'sg');
-    dummyChangeset.set('org.usa.ny', 'ny');
-    dummyChangeset.set('org.usa.ma', { name: 'Massachusetts' });
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.org.asia.sg = 'sg';
+    dummyChangeset.content.org.usa.ny = 'ny';
+    dummyChangeset.content.org.usa.ma = { name: 'Massachusetts' };
     dummyChangeset.execute();
     expect(dummyModel.org).toEqual(expectedResult.org);
 
     expectedResult.org.usa.or = 'or';
     dummyChangeset.rollback();
-    dummyChangeset.set('org.usa.or', 'or');
+    dummyChangeset.content.org.usa.or = 'or';
     dummyChangeset.execute();
     expect(dummyModel.org).toEqual(expectedResult.org);
   });
@@ -2678,74 +2679,98 @@ describe('Unit | Utility | changeset', () => {
     dummyModel.name = 'J';
     dummyModel.password = false;
     dummyModel.options = null;
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
     await dummyChangeset.validate();
-    expect(get(dummyChangeset, 'error.password')).toEqual({
+    expect(getDeep(dummyChangeset, 'error.password')).toEqual({
       validation: ['foo', 'bar'],
       value: false
     });
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(8);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(8);
   });
 
   it('#validate/0 validates nested fields', async () => {
     dummyModel.org = { usa: { ny: 7 } };
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
     await dummyChangeset.validate();
-    expect(get(dummyChangeset, 'error.org.usa.ny')).toEqual({
+    expect(getDeep(dummyChangeset, 'error.org.usa.ny')).toEqual({
       validation: ['only letters work'],
       value: 7
     });
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(8);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(8);
   });
 
   it('#validate/1 validates a single field immediately', async () => {
     dummyModel.name = 'J';
     dummyModel.password = '123';
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
     await dummyChangeset.validate('name');
-    expect(get(dummyChangeset, 'error.name')).toEqual({ validation: 'too short', value: 'J' });
+    expect(getDeep(dummyChangeset, 'error.name')).toEqual({ validation: 'too short', value: 'J' });
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(1);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(1);
   });
 
   it('#validate/1 validates with an falsey string value for the validator message', async () => {
     dummyModel.age = 120;
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
     await dummyChangeset.validate('age');
-    expect(get(dummyChangeset, 'error.age')).toEqual({ validation: '', value: 120 });
+    expect(getDeep(dummyChangeset, 'error.age')).toEqual({ validation: '', value: 120 });
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(1);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(1);
   });
 
   it('#validate validates a multiple field immediately', async () => {
     dummyModel.name = 'J';
     dummyModel.password = false;
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
     await dummyChangeset.validate('name', 'password');
-    expect(get(dummyChangeset, 'error.name')).toEqual({ validation: 'too short', value: 'J' });
-    expect(get(dummyChangeset, 'error.password')).toEqual({
+    expect(getDeep(dummyChangeset, 'error.name')).toEqual({ validation: 'too short', value: 'J' });
+    expect(getDeep(dummyChangeset, 'error.password')).toEqual({
       validation: ['foo', 'bar'],
       value: false
     });
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(2);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(2);
   });
 
   it('#validate/1 validates a property with no validation', async () => {
     dummyModel.org = {};
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
     await dummyChangeset.validate('org');
-    expect(get(dummyChangeset, 'error.org')).toEqual(undefined);
+    expect(getDeep(dummyChangeset, 'error.org')).toEqual(undefined);
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(0);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(0);
   });
 
   it('#validate works correctly with changeset values', async () => {
@@ -2770,48 +2795,56 @@ describe('Unit | Utility | changeset', () => {
         }
       }
     };
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
-    expect(get(dummyChangeset, 'errors.length')).toBe(0);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(0);
 
-    dummyChangeset.set('name', 'Jim Bob');
+    dummyChangeset.content.name = 'Jim Bob';
 
     await dummyChangeset.validate();
 
-    expect(get(dummyChangeset, 'errors.length')).toBe(5);
-    expect(get(dummyChangeset, 'errors')[0].key).toBe('password');
-    expect(dummyChangeset.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(5);
+    expect(getDeep(dummyChangeset, 'errors')[2].key).toBe('password');
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
 
-    dummyChangeset.set('passwordConfirmation', true);
+    dummyChangeset.content.passwordConfirmation = true;
 
     await dummyChangeset.validate();
-    expect(get(dummyChangeset, 'errors.length')).toBe(5);
-    expect(get(dummyChangeset, 'errors')[0].key).toBe('org.usa.ny');
-    expect(get(dummyChangeset, 'errors')[1].key).toBe('org.isCompliant');
-    expect(get(dummyChangeset, 'errors')[2].key).toBe('password');
-    expect(get(dummyChangeset, 'errors')[3].key).toBe('passwordConfirmation');
-    expect(dummyChangeset.isInvalid).toEqual(true);
-
-    dummyChangeset.set('org.isCompliant', true);
-    dummyChangeset.set('password', 'foobar');
-    dummyChangeset.set('passwordConfirmation', 'foobar');
-    dummyChangeset.set('email', 'scott.mail@gmail.com');
-    dummyChangeset.set('org.usa.ny', 'NY');
-    dummyChangeset.set('size.value', 1001);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(5);
+    expect(getDeep(dummyChangeset, 'errors')[0].key).toBe('org.isCompliant');
+    expect(getDeep(dummyChangeset, 'errors')[1].key).toBe('org.usa.ny');
+    expect(getDeep(dummyChangeset, 'errors')[2].key).toBe('password');
+    expect(getDeep(dummyChangeset, 'errors')[3].key).toBe('passwordConfirmation');
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+
+    dummyChangeset.content.org.isCompliant = true;
+    dummyChangeset.content.password = 'foobar';
+    dummyChangeset.content.passwordConfirmation = 'foobar';
+    dummyChangeset.content.email = 'scott.mail@gmail.com';
+    dummyChangeset.content.org.usa.ny = 'NY';
+    dummyChangeset.content.size.value = 1001;
 
     await dummyChangeset.validate();
 
-    expect(get(dummyChangeset, 'errors.length')).toBe(0);
-    expect(dummyChangeset.isValid).toEqual(true);
-    expect((dummyChangeset.size as Record<string, any>).value).toEqual(1001);
-    expect((dummyChangeset.size as Record<string, any>).power10).toEqual(10);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(0);
+    expect(dummyChangeset.content.isValid).toEqual(true);
+    expect((dummyChangeset.content.size as Record<string, any>).value).toEqual(1001);
+    expect((dummyChangeset.content.size as Record<string, any>).power10).toEqual(10);
   });
 
   it('#validate works correctly with complex values', () => {
     dummyModel = {};
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
-    dummyChangeset.set('options', { persist: true });
+    dummyChangeset.content.options = { persist: true };
     dummyChangeset.validate();
     expect(dummyChangeset.changes[0]).toEqual({ key: 'options', value: { persist: true } });
   });
@@ -2821,10 +2854,14 @@ describe('Unit | Utility | changeset', () => {
       ...dummyModel,
       ...{ name: 'Jim Bob', password: true, passwordConfirmation: true, async: true }
     };
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
-    dummyChangeset.set('name', 'foo bar');
-    dummyChangeset.set('password', false);
+    dummyChangeset.content.name = 'foo bar';
+    dummyChangeset.content.password = false;
 
     await dummyChangeset.validate();
     expect(dummyChangeset.changes).toEqual([
@@ -2862,12 +2899,16 @@ describe('Unit | Utility | changeset', () => {
         }
       }
     };
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
-    dummyChangeset.set('options', options);
+    dummyChangeset.content.options = options;
 
     await dummyChangeset.validate();
-    expect(dummyChangeset.error).toEqual({});
+    expect(dummyChangeset.content.error).toEqual({});
     expect(dummyChangeset.changes).toEqual([]);
   });
 
@@ -2878,9 +2919,13 @@ describe('Unit | Utility | changeset', () => {
       }
     };
 
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
     await dummyChangeset.validate('org.usa.ny');
-    expect(get(dummyChangeset, 'error.org.usa.ny')).toEqual({
+    expect(getDeep(dummyChangeset, 'error.org.usa.ny')).toEqual({
       validation: ['must be present'],
       value: null
     });
@@ -2893,17 +2938,21 @@ describe('Unit | Utility | changeset', () => {
       ...dummyModel,
       ...{ name: 'Jim Bob', password: true, passwordConfirmation: true }
     };
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    let dummyChangeset = new Changeset(
+      dummyModel,
+      lookupValidator(dummyValidations),
+      dummyValidations
+    );
 
-    dummyChangeset.set('name', 'foo bar');
-    dummyChangeset.set('password', false);
-    dummyChangeset.set('async', true);
+    dummyChangeset.content.name = 'foo bar';
+    dummyChangeset.content.password = false;
+    dummyChangeset.content.async = true;
 
     await dummyChangeset.validate();
     expect(dummyChangeset.changes).toEqual([
+      { key: 'async', value: true },
       { key: 'name', value: 'foo bar' },
-      { key: 'password', value: false },
-      { key: 'async', value: true }
+      { key: 'password', value: false }
     ]);
   });
 
@@ -2933,7 +2982,7 @@ describe('Unit | Utility | changeset', () => {
       changes: any;
       content: any;
     }) {
-      let validatorFn = get(Validations, key);
+      let validatorFn = getDeep(Validations, key);
 
       if (typeof validatorFn === 'function') {
         return validatorFn(newValue, oldValue, changes, content);
@@ -2941,22 +2990,26 @@ describe('Unit | Utility | changeset', () => {
     }
 
     const myObject = new MyModel();
-    const myChangeset = Changeset(myObject, myValidator, Validations);
+    const myChangeset = new Changeset(myObject, myValidator, Validations);
 
     Object.defineProperty(myChangeset, 'isOptionSelected', {
-      get() {
-        return this.get('isOptionOne') || this.get('isOptionTwo') || this.get('isOptionThree');
+      getDeep() {
+        return (
+          this.getDeep('isOptionOne') ||
+          this.getDeep('isOptionTwo') ||
+          this.getDeep('isOptionThree')
+        );
       }
     });
 
     await myChangeset.validate();
     expect(myChangeset.isInvalid).toEqual(false);
 
-    myChangeset.set('isOptionThree', false);
+    myChangeset.content.isOptionThree = false;
     await myChangeset.validate();
     expect(myChangeset.isInvalid).toEqual(true);
 
-    myChangeset.set('isOptionTwo', true);
+    myChangeset.content.isOptionTwo = true;
     await myChangeset.validate();
     expect(myChangeset.isInvalid).toEqual(false);
   });
@@ -2974,13 +3027,13 @@ describe('Unit | Utility | changeset', () => {
       name: new PersonalValidator()
     };
     dummyModel.name = 'J';
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(validationMap), validationMap);
-    dummyChangeset.name = null;
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(validationMap), validationMap);
+    dummyChangeset.content.name = null;
 
     await dummyChangeset.validate();
 
-    expect(get(dummyChangeset, 'errors.length')).toBe(1);
-    expect(get(dummyChangeset, 'error.name.validation')).toEqual('oh no');
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(1);
+    expect(getDeep(dummyChangeset, 'error.name.validation')).toEqual('oh no');
     expect(dummyChangeset.changes).toEqual([
       {
         key: 'name',
@@ -3005,13 +3058,13 @@ describe('Unit | Utility | changeset', () => {
       name: [validatePresence(), new PersonalValidator()]
     };
     dummyModel.name = 'J';
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(validationMap), validationMap);
-    dummyChangeset.name = null;
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(validationMap), validationMap);
+    dummyChangeset.content.name = null;
 
     await dummyChangeset.validate();
 
-    expect(get(dummyChangeset, 'errors.length')).toBe(1);
-    expect(get(dummyChangeset, 'error.name.validation')).toEqual(['oh no']);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(1);
+    expect(getDeep(dummyChangeset, 'error.name.validation')).toEqual(['oh no']);
     expect(dummyChangeset.changes).toEqual([
       {
         key: 'name',
@@ -3022,7 +3075,7 @@ describe('Unit | Utility | changeset', () => {
 
   it('#isInvalid does not trigger validations without validate keys', async () => {
     const model = { name: 'o' };
-    const dummyChangeset = Changeset(model, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(model, lookupValidator(dummyValidations));
 
     expect(dummyChangeset.isValid).toEqual(true);
     expect(dummyChangeset.isInvalid).toEqual(false);
@@ -3035,7 +3088,7 @@ describe('Unit | Utility | changeset', () => {
 
   it('#isInvalid does not trigger on init of changeset', async () => {
     const model = { name: 'o' };
-    const dummyChangeset = Changeset(model, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(model, lookupValidator(dummyValidations));
 
     expect(dummyChangeset.isValid).toEqual(true);
     expect(dummyChangeset.isInvalid).toEqual(false);
@@ -3051,71 +3104,65 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#addError adds an error to the changeset', () => {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.addError('email', {
-      value: 'jim@bob.com',
-      validation: 'Email already taken'
-    });
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.pushErrors('email', new Err('jim@bob.com', 'Email already taken'));
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(get(dummyChangeset, 'error.email.validation')).toBe('Email already taken');
-    dummyChangeset.set('email', 'unique@email.com');
-    expect(dummyChangeset.isValid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'error.email.validation')).toBe('Email already taken');
+    dummyChangeset.content.email = 'unique@email.com';
+    expect(dummyChangeset.content.isValid).toEqual(true);
   });
 
   it('#addError adds an error then validates', async () => {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.addError('email', {
-      value: 'jim@bob.com',
-      validation: 'Email already taken'
-    });
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.pushErrors('email', new Err('jim@bob.com', 'Email already taken'));
 
     expect(dummyChangeset.isInvalid).toEqual(true);
     await dummyChangeset.validate();
 
-    expect(get(dummyChangeset, 'error.email')).toEqual({
+    expect(getDeep(dummyChangeset, 'error.email')).toEqual({
       validation: 'Email already taken',
       value: 'jim@bob.com'
     });
     expect(dummyChangeset.changes).toEqual([]);
-    expect(get(dummyChangeset, 'errors.length')).toBe(1);
+    expect(getDeep(dummyChangeset, 'errors.length')).toBe(1);
   });
 
   it('#addError adds an error to the changeset using the shortcut', function() {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('email', 'jim@bob.com');
-    dummyChangeset.addError('email', 'Email already taken');
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.email = 'jim@bob.com';
+    dummyChangeset.pushErrors('email', 'Email already taken');
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(get(dummyChangeset, 'error.email.validation')).toBe('Email already taken');
-    expect(get(dummyChangeset, 'error.email.value')).toBe('jim@bob.com');
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'error.email.validation')).toBe('Email already taken');
+    expect(getDeep(dummyChangeset, 'error.email.value')).toBe('jim@bob.com');
     expect(dummyChangeset.changes).toEqual([{ key: 'email', value: 'jim@bob.com' }]);
-    dummyChangeset.set('email', 'unique@email.com');
-    expect(dummyChangeset.isValid).toEqual(true);
+    dummyChangeset.content.email = 'unique@email.com';
+    expect(dummyChangeset.content.isValid).toEqual(true);
     expect(dummyChangeset.changes[0]).toEqual({ key: 'email', value: 'unique@email.com' });
   });
 
   it('#addError adds an error to the changeset on a nested property', () => {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.addError('email.localPart', 'Cannot contain +');
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.pushErrors('email.localPart', 'Cannot contain +');
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(get(dummyChangeset, 'error.email.localPart.validation')).toBe('Cannot contain +');
-    dummyChangeset.set('email.localPart', 'ok');
-    expect(dummyChangeset.isValid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'error.email.localPart.validation')).toBe('Cannot contain +');
+    dummyChangeset.content.email.localPart = 'ok';
+    expect(dummyChangeset.content.isValid).toEqual(true);
   });
 
   it('#addError adds an array of errors to the changeset', () => {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.addError('email', ['jim@bob.com', 'Email already taken']);
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.pushErrors('email', new Err('jim@bob.com', 'Email already taken'));
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(get(dummyChangeset, 'error.email.validation')).toEqual([
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'error.email.validation')).toEqual([
       'jim@bob.com',
       'Email already taken'
     ]);
-    dummyChangeset.set('email', 'unique@email.com');
-    expect(dummyChangeset.isValid).toEqual(true);
+    dummyChangeset.content.email = 'unique@email.com';
+    expect(dummyChangeset.content.isValid).toEqual(true);
   });
 
   /**
@@ -3123,49 +3170,49 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#pushErrors pushes an error into an array of existing validations', function() {
-    let dummyChangeset = Changeset(dummyModel);
-    dummyChangeset.set('email', 'jim@bob.com');
-    dummyChangeset.addError('email', 'Email already taken');
+    let dummyChangeset = new Changeset(dummyModel);
+    dummyChangeset.content.email = 'jim@bob.com';
+    dummyChangeset.pushErrors('email', 'Email already taken');
     dummyChangeset.pushErrors('email', 'Invalid email format');
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(get(dummyChangeset, 'error.email.validation')).toEqual([
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'error.email.validation')).toEqual([
       'Email already taken',
       'Invalid email format'
     ]);
-    expect(get(dummyChangeset, 'error.email.value')).toBe('jim@bob.com');
+    expect(getDeep(dummyChangeset, 'error.email.value')).toBe('jim@bob.com');
     expect(dummyChangeset.changes).toEqual([{ key: 'email', value: 'jim@bob.com' }]);
-    dummyChangeset.set('email', 'unique@email.com');
-    expect(dummyChangeset.isValid).toEqual(true);
+    dummyChangeset.content.email = 'unique@email.com';
+    expect(dummyChangeset.content.isValid).toEqual(true);
     expect(dummyChangeset.changes[0]).toEqual({ key: 'email', value: 'unique@email.com' });
   });
 
   it('#pushErrors pushes an error if no existing validations are present', function() {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'J');
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'J';
     dummyChangeset.pushErrors('name', 'cannot be J');
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(dummyChangeset.isValid).toEqual(false);
-    expect(get(dummyChangeset, 'error.name.validation')).toEqual(['too short', 'cannot be J']);
-    expect(get(dummyChangeset, 'error.name.value')).toBe('J');
-    dummyChangeset.set('name', 'Good name');
-    expect(dummyChangeset.isValid).toEqual(true);
-    expect(dummyChangeset.isInvalid).toEqual(false);
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(dummyChangeset.content.isValid).toEqual(false);
+    expect(getDeep(dummyChangeset, 'error.name.validation')).toEqual(['too short', 'cannot be J']);
+    expect(getDeep(dummyChangeset, 'error.name.value')).toBe('J');
+    dummyChangeset.content.name = 'Good name';
+    expect(dummyChangeset.content.isValid).toEqual(true);
+    expect(dummyChangeset.content.isInvalid).toEqual(false);
   });
 
   it('#pushErrors adds an error to the changeset on a nested property', () => {
-    let dummyChangeset = Changeset(dummyModel);
+    let dummyChangeset = new Changeset(dummyModel);
     dummyChangeset.pushErrors('email.localPart', 'Cannot contain +');
     dummyChangeset.pushErrors('email.localPart', 'is too short');
 
-    expect(dummyChangeset.isInvalid).toEqual(true);
-    expect(get(dummyChangeset, 'error.email.localPart.validation')).toEqual([
+    expect(dummyChangeset.content.isInvalid).toEqual(true);
+    expect(getDeep(dummyChangeset, 'error.email.localPart.validation')).toEqual([
       'Cannot contain +',
       'is too short'
     ]);
-    dummyChangeset.set('email.localPart', 'ok');
-    expect(dummyChangeset.isValid).toEqual(true);
+    dummyChangeset.content.email.localPart = 'ok';
+    expect(dummyChangeset.content.isValid).toEqual(true);
   });
 
   /**
@@ -3173,9 +3220,9 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#snapshot creates a snapshot of the changeset', () => {
-    let dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangeset.set('name', 'Pokemon Go');
-    dummyChangeset.set('password', false);
+    let dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangeset.content.name = 'Pokemon Go';
+    dummyChangeset.content.password = false;
     let snapshot = dummyChangeset.snapshot();
     let expectedResult = {
       changes: { name: 'Pokemon Go', password: false },
@@ -3183,7 +3230,7 @@ describe('Unit | Utility | changeset', () => {
     };
 
     expect(snapshot).toEqual(expectedResult);
-    dummyChangeset.set('name', "Gotta catch'em all");
+    dummyChangeset.content.name = "Gotta catch'em all";
     expect(snapshot).toEqual(expectedResult);
   });
 
@@ -3192,57 +3239,22 @@ describe('Unit | Utility | changeset', () => {
    */
 
   it('#restore restores a snapshot of the changeset', () => {
-    let dummyChangesetA = Changeset(dummyModel, lookupValidator(dummyValidations));
-    let dummyChangesetB = Changeset(dummyModel, lookupValidator(dummyValidations));
-    dummyChangesetA.set('name', 'Pokemon Go');
-    dummyChangesetA.set('password', false);
+    let dummyChangesetA = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    let dummyChangesetB = new Changeset(dummyModel, lookupValidator(dummyValidations));
+    dummyChangesetA.content.name = 'Pokemon Go';
+    dummyChangesetA.content.password = false;
     let snapshot = dummyChangesetA.snapshot();
 
     expect(dummyChangesetB.isValid).toEqual(true);
     dummyChangesetB.restore(snapshot);
     expect(dummyChangesetB.isInvalid).toEqual(true);
-    expect(get(dummyChangesetB, 'change.name')).toBe('Pokemon Go');
-    expect(get(dummyChangesetB, 'error.password')).toEqual({
+    expect(getDeep(dummyChangesetB, 'change.name')).toBe('Pokemon Go');
+    expect(getDeep(dummyChangesetB, 'error.password')).toEqual({
       validation: ['foo', 'bar'],
       value: false
     });
   });
 
-  /**
-   * #cast
-   */
-
-  it('#cast allows only specified keys to exist on the changeset', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    const expectedResult = [
-      { key: 'name', value: 'Pokemon Go' },
-      { key: 'password', value: true }
-    ];
-    const allowed = ['name', 'password'];
-    dummyChangeset.set('name', 'Pokemon Go');
-    dummyChangeset.set('password', true);
-    dummyChangeset.set('unwantedProp', 123);
-    dummyChangeset.cast(allowed);
-
-    expect(dummyChangeset.get('changes')).toEqual(expectedResult);
-    expect(dummyChangeset.get('unwantedProp')).toBe(undefined);
-  });
-
-  it('#cast noops if no keys are passed', () => {
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
-    const expectedResult = [
-      { key: 'name', value: 'Pokemon Go' },
-      { key: 'password', value: true },
-      { key: 'unwantedProp', value: 123 }
-    ];
-    dummyChangeset.set('name', 'Pokemon Go');
-    dummyChangeset.set('password', true);
-    dummyChangeset.set('unwantedProp', 123);
-    dummyChangeset.cast();
-
-    expect(dummyChangeset.get('changes')).toEqual(expectedResult);
-  });
-
   /**
    * #isValidating
    */
@@ -3257,7 +3269,7 @@ describe('Unit | Utility | changeset', () => {
     };
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
     dummyChangeset['reservations'] = 'DCE12345';
 
     dummyChangeset.validate();
@@ -3277,7 +3289,7 @@ describe('Unit | Utility | changeset', () => {
     };
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
 
     dummyChangeset.validate();
     expect(dummyChangeset.isValidating()).toBeTruthy();
@@ -3299,7 +3311,7 @@ describe('Unit | Utility | changeset', () => {
     let hasFired = false;
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
     dummyChangeset.on('beforeValidation', () => {
       hasFired = true;
     });
@@ -3319,7 +3331,7 @@ describe('Unit | Utility | changeset', () => {
     let hasFired = false;
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
     dummyChangeset.on('beforeValidation', (key: string) => {
       if (key === 'reservations') {
         hasFired = true;
@@ -3345,7 +3357,7 @@ describe('Unit | Utility | changeset', () => {
     let hasFired = false;
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
     dummyChangeset.on('afterValidation', () => {
       hasFired = true;
     });
@@ -3365,7 +3377,7 @@ describe('Unit | Utility | changeset', () => {
     let hasFired = false;
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
     dummyChangeset.on('afterValidation', (key: string) => {
       if (key === 'reservations') {
         hasFired = true;
@@ -3391,7 +3403,7 @@ describe('Unit | Utility | changeset', () => {
     let hasFired = false;
 
     dummyModel['reservations'] = 'ABC12345';
-    dummyChangeset = Changeset(dummyModel, _validator, _validations);
+    dummyChangeset = new Changeset(dummyModel, _validator, _validations);
     dummyChangeset.on('afterRollback', () => {
       hasFired = true;
     });
@@ -3411,9 +3423,9 @@ describe('Unit | Utility | changeset', () => {
       usa: { ny: null }
     };
 
-    const c = Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
+    const c = new Changeset(dummyModel, lookupValidator(dummyValidations), dummyValidations);
     c.validate('org.usa.ny')
-      .then(() => c.set('org.usa.ny', 'should not fail'))
+      .then(() => (c.content.org.usa.ny = 'should not fail'))
       .finally(done());
   });
 
@@ -3432,15 +3444,15 @@ describe('Unit | Utility | changeset', () => {
       });
     };
 
-    const dummyChangeset = Changeset(dummyModel, lookupValidator(dummyValidations));
+    const dummyChangeset = new Changeset(dummyModel, lookupValidator(dummyValidations));
 
-    dummyChangeset.set('delayedAsync', 'first');
+    dummyChangeset.content.delayedAsync = 'first';
     let firstResolver = latestDelayedAsyncResolver;
-    dummyChangeset.set('delayedAsync', 'second');
+    dummyChangeset.content.delayedAsync = 'second';
     let secondResolver = latestDelayedAsyncResolver;
 
     // second one resolves first with false
-    secondResolver(false);
+    secondResolver('an error');
     // then the first resolves first with true
     firstResolver(true);
 
@@ -3453,16 +3465,16 @@ describe('Unit | Utility | changeset', () => {
     // current value state should be "second"
     // current error state should be invalid
     const expectedChanges = [{ key: 'delayedAsync', value: 'second' }];
-    const expectedError = { delayedAsync: { validation: false, value: 'second' } };
+    const expectedError = { delayedAsync: new Err('second', 'an error') };
     expect(dummyChangeset.changes).toEqual(expectedChanges);
-    expect(dummyChangeset.error).toEqual(expectedError);
+    expect(dummyChangeset.content.error).toEqual(expectedError);
   });
 
   /**
    * #unexecute
    */
   it('#unexecute after #save on new ember-data model', async () => {
-    const changeset = Changeset(dummyModel);
+    const changeset = new Changeset(dummyModel);
     try {
       changeset.unexecute();
       expect(true);
diff --git a/test/utils/build-old-values.test.ts b/test/utils/build-old-values.test.ts
index 3d30012..399646e 100644
--- a/test/utils/build-old-values.test.ts
+++ b/test/utils/build-old-values.test.ts
@@ -1,5 +1,4 @@
 import { buildOldValues } from '../../src/utils/build-old-values';
-import getDeep from '../../src/utils/get-deep';
 
 describe('Unit | Utility | build old values', () => {
   it('it returns k-v of old values', () => {
@@ -9,7 +8,7 @@ describe('Unit | Utility | build old values', () => {
       { key: 'user.lastName', value: 'Bolton' }
     ];
 
-    const contentValues = buildOldValues(objA, changes, getDeep);
+    const contentValues = buildOldValues(objA, changes);
 
     expect(contentValues).toEqual({ 'user.firstName': 'Ivan' });
   });
@@ -18,7 +17,7 @@ describe('Unit | Utility | build old values', () => {
     const objA = { user: { firstName: 'Ivan' } };
     const changes = [{ key: 'user.firstName', value: 'Ivan' }];
 
-    const contentValues = buildOldValues(objA, changes, getDeep);
+    const contentValues = buildOldValues(objA, changes);
 
     expect(contentValues).toEqual({ 'user.firstName': 'Ivan' });
   });
@@ -30,7 +29,7 @@ describe('Unit | Utility | build old values', () => {
       { key: 'user.lastName.nickname', value: 'Bolt' }
     ];
 
-    const contentValues = buildOldValues(objA, changes, getDeep);
+    const contentValues = buildOldValues(objA, changes);
 
     expect(contentValues).toEqual({ 'user.firstName': 'Ivan', 'user.lastName.nickname': 'CC' });
   });
diff --git a/test/utils/get-deep.test.ts b/test/utils/get-deep.test.ts
index 1c77681..1873a21 100644
--- a/test/utils/get-deep.test.ts
+++ b/test/utils/get-deep.test.ts
@@ -1,5 +1,5 @@
-import getDeep, { getSubObject } from '../../src/utils/get-deep';
 import Change from '../../src/-private/change';
+import getDeep, { getSubObject } from '../../src/-private/utils/get-deep';
 
 describe('Unit | Utility | get deep', () => {
   it('it returns value', () => {
diff --git a/test/utils/is-changeset.test.ts b/test/utils/is-changeset.test.ts
deleted file mode 100644
index 5bcbae0..0000000
--- a/test/utils/is-changeset.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Changeset } from '../../src';
-import isChangeset from '../../src/utils/is-changeset';
-
-describe('Unit | Utility | is changeset', function() {
-  it('it correctly identifies changesets', () => {
-    const dummy = Changeset({});
-    expect(isChangeset(dummy)).toBeTruthy();
-  });
-
-  it('it correctly identifies non-changesets', () => {
-    expect(isChangeset({})).toBeFalsy();
-  });
-});
diff --git a/test/utils/is-object.test.ts b/test/utils/is-object.test.ts
index d04657f..6d18326 100644
--- a/test/utils/is-object.test.ts
+++ b/test/utils/is-object.test.ts
@@ -1,4 +1,4 @@
-import isObject from '../../src/utils/is-object';
+import isObject from '../../src/-private/utils/is-object';
 
 describe('Unit | Utility | is object', function() {
   const testData = [
diff --git a/test/utils/set-deep.test.ts b/test/utils/set-deep.test.ts
index bb9eb14..d90ae85 100644
--- a/test/utils/set-deep.test.ts
+++ b/test/utils/set-deep.test.ts
@@ -1,5 +1,5 @@
-import setDeep from '../../src/utils/set-deep';
 import Change from '../../src/-private/change';
+import setDeep from '../../src/-private/utils/set-deep';
 
 describe('Unit | Utility | set deep', () => {
   it('it sets value', () => {
diff --git a/tsconfig.json b/tsconfig.json
index 4742f21..8d2161f 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -59,7 +59,7 @@
     // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
 
     /* Experimental Options */
-    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
     // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
   },
   "include": [