diff --git a/README.md b/README.md
index 42929918f..ddb51dcf0 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ This repo consists of the following npm modules:
 
 - [@readme/api-explorer](https://npm.im/@readme/api-explorer) - the React components that make up the explorer
 - [@readme/markdown](https://npm.im/@readme/markdown) - the markdown parser
+- [@readme/markdown-magic](https://npm.im/@readme/markdown-magic) - the legacy "magic block"-based markdown parser
 - [@readme/oas-extensions](https://npm.im/@readme/oas-extensions) - an exported object of our [OAS extensions](https://docs.readme.com/docs/swagger-extensions)
 - [@readme/oas-to-har](https://npm.im/@readme/oas-to-har) - utility to transform an OAS operation into a HAR representation
 - [@readme/syntax-highlighter](https://npm.im/@readme/syntax-highlighter) - the syntax highlighter in use on ReadMe
diff --git a/example/index.html b/example/index.html
index dd49dfd2f..17820ed84 100644
--- a/example/index.html
+++ b/example/index.html
@@ -9,6 +9,20 @@
     .api-list-header {
       padding-left: 30px;
     }
+
+    .api-experiments label {
+      margin-top: 0;
+      font-size: 14px;
+      line-height: 24px;
+      color: #747c84;
+      padding-left: 5px;
+    }
+
+    .api-experiments li {
+      display: inline;
+      padding-right: 10px;
+    }
+
     /* Removing sidebar padding */
     section#hub-content {
       padding-left: 0;
diff --git a/example/src/Demo.jsx b/example/src/Demo.jsx
index 95442eafb..7e60be66e 100644
--- a/example/src/Demo.jsx
+++ b/example/src/Demo.jsx
@@ -9,63 +9,130 @@ const ApiExplorer = require('../../packages/api-explorer/src');
 const Logs = require('../../packages/api-logs/index');
 const ApiList = require('./ApiList');
 
-require('../../example/swagger-files/types.json');
-require('../../example/swagger-files/response-schemas.json');
-
 require('../../packages/api-logs/main.css');
 
-function Demo({ fetchSwagger, status, docs, oas, oauth }) {
-  return (
-    <div>
-      <div className="api-list-header">
-        <ApiList fetchSwagger={fetchSwagger} />
-        <pre>{status.join('\n')}</pre>
+class Demo extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+      brokenExplorerState: false,
+      maskErrorMessages: false,
+      useNewMarkdownEngine: false,
+    };
+  }
+
+  experimentToggles() {
+    const experiments = {
+      'Mask error messages?': {
+        description: 'Switch between our different error states: consumer and project/API owner.',
+        stateProp: 'maskErrorMessages',
+      },
+      'Show fully broken state?': {
+        description: "Send the Explorer into a broken state. You'll need to refresh the page to get it working again.",
+        stateProp: 'brokenExplorerState',
+      },
+      'Use new Markdown engine?': {
+        description: null,
+        stateProp: 'useNewMarkdownEngine',
+      },
+    };
+
+    return (
+      <div className="api-experiments">
+        <ul>
+          {Object.keys(experiments).map(name => {
+            const experiment = experiments[name];
+
+            return (
+              <li key={name}>
+                <input
+                  checked={this.state[experiment.stateProp]}
+                  name={experiment.stateProp}
+                  onChange={e => {
+                    this.setState({ [experiment.stateProp]: e.target.checked });
+                    this.forceUpdate();
+                  }}
+                  type="checkbox"
+                />
+                <label htmlFor={experiment.stateProp} title={experiment.description}>
+                  {name}
+                </label>
+              </li>
+            );
+          })}
+        </ul>
+      </div>
+    );
+  }
+
+  render() {
+    const { fetchSwagger, status, docs, oas, oauth } = this.props;
+    const { brokenExplorerState, maskErrorMessages, useNewMarkdownEngine } = this.state;
+
+    const additionalProps = {
+      oasFiles: {
+        'api-setting': Object.assign(extensions.defaults, oas),
+      },
+    };
+
+    if (brokenExplorerState) {
+      delete additionalProps.oasFiles;
+    }
+
+    return (
+      <div>
+        <div className="api-list-header">
+          <ApiList fetchSwagger={fetchSwagger} />
+
+          {status.length > 0 ? <pre>{status.join('\n')}</pre> : this.experimentToggles()}
+        </div>
+
+        {status.length === 0 && (
+          <ApiExplorer
+            {...additionalProps}
+            // Uncomment this in for column layout
+            // appearance={{ referenceLayout: 'column' }}
+            appearance={{ referenceLayout: 'row' }}
+            // Uncomment this if you want to test enterprise-structured URLs
+            // baseUrl={'/child/v1.0'}
+            baseUrl="/"
+            // To test the top level error boundary, uncomment this
+            // docs={[null, null]}
+            docs={docs}
+            // We only really set this to `true` for testing sites for errors using puppeteer
+            dontLazyLoad={false}
+            flags={{ correctnewlines: false }}
+            glossaryTerms={[{ term: 'apiKey', definition: 'This is a definition' }]}
+            Logs={Logs}
+            maskErrorMessages={maskErrorMessages}
+            oauth={oauth}
+            suggestedEdits
+            useNewMarkdownEngine={useNewMarkdownEngine}
+            variables={{
+              // Uncomment this to test without logs
+              // user: {}
+              // Uncomment this to test with logs
+              // user: {
+              //   keys: [
+              //     { id: 'someid', name: 'project1', apiKey: '123' },
+              //     { id: 'anotherid', name: 'project2', apiKey: '456' },
+              //   ],
+              // },
+              // Uncomment this to test without keys array
+              // user: { user: '123456', pass: 'abc', apiKey: '123456' },
+              user: {
+                keys: [
+                  { id: 'asdfghjkl', name: 'project1', apiKey: '123', user: 'user1', pass: 'pass1' },
+                  { id: 'zxcvbnm', name: 'project2', apiKey: '456', user: 'user2', pass: 'pass2' },
+                ],
+              },
+              defaults: [],
+            }}
+          />
+        )}
       </div>
-      {status.length === 0 && (
-        <ApiExplorer
-          // Uncomment this in for column layout
-          // appearance={{ referenceLayout: 'column' }}
-          appearance={{ referenceLayout: 'row' }}
-          // Uncomment this if you want to test enterprise-structured URLs
-          // baseUrl={'/child/v1.0'}
-          baseUrl="/"
-          // To test the top level error boundary, uncomment this
-          // docs={[null, null]}
-          docs={docs}
-          // We only really set this to `true` for testing sites for errors using puppeteer
-          dontLazyLoad={false}
-          flags={{ correctnewlines: false }}
-          glossaryTerms={[{ term: 'apiKey', definition: 'This is a definition' }]}
-          Logs={Logs}
-          oasFiles={{
-            'api-setting': Object.assign(extensions.defaults, oas),
-          }}
-          oauth={oauth}
-          suggestedEdits
-          variables={{
-            // Uncomment this to test without logs
-            // user: {}
-            // Uncomment this to test with logs
-            // user: {
-            //   keys: [
-            //     { id: 'someid', name: 'project1', apiKey: '123' },
-            //     { id: 'anotherid', name: 'project2', apiKey: '456' },
-            //   ],
-            // },
-            // Uncomment this to test without keys array
-            // user: { user: '123456', pass: 'abc', apiKey: '123456' },
-            user: {
-              keys: [
-                { id: 'asdfghjkl', name: 'project1', apiKey: '123', user: 'user1', pass: 'pass1' },
-                { id: 'zxcvbnm', name: 'project2', apiKey: '456', user: 'user2', pass: 'pass2' },
-              ],
-            },
-            defaults: [],
-          }}
-        />
-      )}
-    </div>
-  );
+    );
+  }
 }
 
 Demo.propTypes = {
diff --git a/example/swagger-files/all-of.json b/example/swagger-files/all-of.json
deleted file mode 100644
index 904fb8838..000000000
--- a/example/swagger-files/all-of.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "servers": [
-    {
-      "url": "http://httpbin.org"
-    }
-  ],
-  "info": {
-    "version": "1.0.0",
-    "title": "allOf keyword - NOT CURRENTLY SUPPORTED"
-  },
-  "paths": {
-    "/anything/all-of-object": {
-      "post": {
-        "summary": "allOf object - NOT CURRENTLY SUPPORTED",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "allOf": [
-                  {
-                    "title": "First type of object",
-                    "type": "object",
-                    "properties": {
-                      "a": {
-                        "type": "string"
-                      },
-                      "b": {
-                        "type": "string"
-                      }
-                    }
-                  },
-                  {
-                    "title": "Second type of object",
-                    "type": "object",
-                    "properties": {
-                      "c": {
-                        "type": "string"
-                      },
-                      "d": {
-                        "type": "string"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "/anything/all-of-primitive": {
-      "post": {
-        "summary": "allOf primitive - NOT CURRENTLY SUPPORTED",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "allOf": [
-                  {
-                    "title": "First type of primitive",
-                    "type": "string"
-                  },
-                  {
-                    "title": "Second type of primitive",
-                    "type": "integer"
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/example/swagger-files/any-of.json b/example/swagger-files/any-of.json
deleted file mode 100644
index b72047b05..000000000
--- a/example/swagger-files/any-of.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "servers": [
-    {
-      "url": "http://httpbin.org"
-    }
-  ],
-  "info": {
-    "version": "1.0.0",
-    "title": "anyOf keyword"
-  },
-  "paths": {
-    "/anything/any-of-object": {
-      "post": {
-        "summary": "anyOf object",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "anyOf": [
-                  {
-                    "title": "First type of object",
-                    "type": "object",
-                    "properties": {
-                      "a": {
-                        "type": "string"
-                      },
-                      "b": {
-                        "type": "string"
-                      }
-                    }
-                  },
-                  {
-                    "title": "Second type of object",
-                    "type": "object",
-                    "properties": {
-                      "c": {
-                        "type": "string"
-                      },
-                      "d": {
-                        "type": "string"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "/anything/any-of-primitive": {
-      "post": {
-        "summary": "anyOf primitive",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "anyOf": [
-                  {
-                    "title": "First type of primitive",
-                    "type": "string"
-                  },
-                  {
-                    "title": "Second type of primitive",
-                    "type": "integer"
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/example/swagger-files/circular.json b/example/swagger-files/circular.json
deleted file mode 100644
index f2ae09174..000000000
--- a/example/swagger-files/circular.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "title": "circular swagger file",
-    "version": "1.0"
-  },
-  "schemes": [
-    "http"
-  ],
-  "host": "httpbin.org",
-  "paths": {
-    "/circular": {
-      "post": {
-        "parameters": [
-          {
-            "in": "body",
-            "name": "body",
-            "schema": {
-              "$ref": "#/definitions/node"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Circular"
-          }
-        }
-      },
-      "put": {
-        "description": "This example fails due to a bug in RJSF when attempting to compute defaults for objects with refs.",
-        "requestBody": {
-          "content": {
-            "application\/json": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "obj": {
-                    "$ref": "#/definitions/user"
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  "definitions": {
-    "node": {
-      "type": "object",
-      "properties": {
-        "string": {
-          "type": "string"
-        },
-        "children": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/node"
-          }
-        }
-      }
-    },
-    "user": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string"
-        },
-        "otherUser": {
-          "$ref": "#/definitions/user"
-        }
-      }
-    }
-  }
-}
diff --git a/example/swagger-files/cyclical-refs.json b/example/swagger-files/cyclical-refs.json
new file mode 100644
index 000000000..67d5d4aea
--- /dev/null
+++ b/example/swagger-files/cyclical-refs.json
@@ -0,0 +1,381 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "Document Resource",
+    "description": "Use this for adding, updating or removing documents.",
+    "version": "1.0.0"
+  },
+  "paths": {
+    "/document": {
+      "put": {
+        "summary": "Add or update documents",
+        "operationId": "putMultiPartFormData",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "API key.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "file": {
+                    "$ref": "#/components/schemas/FormDataBodyPart"
+                  },
+                  "typename": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Successfully processed."
+          },
+          "400": {
+            "description": "Invalid payload. This can be due to invalid headers or form-data params."
+          },
+          "401": {
+            "description": "Permissions error. The Authorization header may be missing, the value may be invalid or the associated organization/user does not have permission to modify the specified typename."
+          },
+          "500": {
+            "description": "Server error. Something unexpected happened while processing the request. Try again later."
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "BodyPart": {
+        "type": "object",
+        "properties": {
+          "contentDisposition": {
+            "$ref": "#/components/schemas/ContentDisposition"
+          },
+          "entity": {
+            "type": "object"
+          },
+          "headers": {
+            "type": "object",
+            "properties": {
+              "empty": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "mediaType": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string"
+              },
+              "subtype": {
+                "type": "string"
+              },
+              "parameters": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "wildcardType": {
+                "type": "boolean"
+              },
+              "wildcardSubtype": {
+                "type": "boolean"
+              }
+            }
+          },
+          "messageBodyWorkers": {
+            "$ref": "#/components/schemas/MessageBodyWorkers"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/MultiPart"
+          },
+          "providers": {
+            "type": "object"
+          },
+          "parameterizedHeaders": {
+            "type": "object",
+            "properties": {
+              "empty": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/ParameterizedHeader"
+              }
+            }
+          }
+        }
+      },
+      "ContentDisposition": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "fileName": {
+            "type": "string"
+          },
+          "creationDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "modificationDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "readDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "size": {
+            "type": "integer",
+            "format": "int64"
+          }
+        }
+      },
+      "FormDataBodyPart": {
+        "type": "object",
+        "properties": {
+          "contentDisposition": {
+            "$ref": "#/components/schemas/ContentDisposition"
+          },
+          "entity": {
+            "type": "object"
+          },
+          "headers": {
+            "type": "object",
+            "properties": {
+              "empty": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "mediaType": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string"
+              },
+              "subtype": {
+                "type": "string"
+              },
+              "parameters": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "wildcardType": {
+                "type": "boolean"
+              },
+              "wildcardSubtype": {
+                "type": "boolean"
+              }
+            }
+          },
+          "messageBodyWorkers": {
+            "$ref": "#/components/schemas/MessageBodyWorkers"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/MultiPart"
+          },
+          "providers": {
+            "type": "object"
+          },
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          },
+          "formDataContentDisposition": {
+            "$ref": "#/components/schemas/FormDataContentDisposition"
+          },
+          "simple": {
+            "type": "boolean"
+          },
+          "parameterizedHeaders": {
+            "type": "object",
+            "properties": {
+              "empty": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/ParameterizedHeader"
+              }
+            }
+          }
+        },
+        "description": "A single file which will be added/updated or a ZIP archive containing files that will be added/updated. The name of the ZIP archive does not matter but the names of the files contained within do.",
+        "example": "file=@2018-report.pdf"
+      },
+      "FormDataContentDisposition": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "fileName": {
+            "type": "string"
+          },
+          "creationDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "modificationDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "readDate": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "size": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "MessageBodyWorkers": {
+        "type": "object"
+      },
+      "MultiPart": {
+        "type": "object",
+        "properties": {
+          "contentDisposition": {
+            "$ref": "#/components/schemas/ContentDisposition"
+          },
+          "entity": {
+            "type": "object"
+          },
+          "headers": {
+            "type": "object",
+            "properties": {
+              "empty": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          "mediaType": {
+            "type": "object",
+            "properties": {
+              "type": {
+                "type": "string"
+              },
+              "subtype": {
+                "type": "string"
+              },
+              "parameters": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                }
+              },
+              "wildcardType": {
+                "type": "boolean"
+              },
+              "wildcardSubtype": {
+                "type": "boolean"
+              }
+            }
+          },
+          "messageBodyWorkers": {
+            "$ref": "#/components/schemas/MessageBodyWorkers"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/MultiPart"
+          },
+          "providers": {
+            "type": "object"
+          },
+          "bodyParts": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/BodyPart"
+            }
+          },
+          "parameterizedHeaders": {
+            "type": "object",
+            "properties": {
+              "empty": {
+                "type": "boolean"
+              }
+            },
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/ParameterizedHeader"
+              }
+            }
+          }
+        }
+      },
+      "ParameterizedHeader": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "parameters": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/example/swagger-files/one-of.json b/example/swagger-files/one-of.json
deleted file mode 100644
index 09550eb29..000000000
--- a/example/swagger-files/one-of.json
+++ /dev/null
@@ -1,156 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "servers": [
-    {
-      "url": "http://httpbin.org"
-    }
-  ],
-  "info": {
-    "version": "1.0.0",
-    "title": "oneOf keyword"
-  },
-  "paths": {
-    "/anything/one-of-object": {
-      "post": {
-        "summary": "oneOf object",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "oneOf": [
-                  {
-                    "title": "First type of object",
-                    "type": "object",
-                    "properties": {
-                      "a": {
-                        "type": "string"
-                      },
-                      "b": {
-                        "type": "string"
-                      }
-                    }
-                  },
-                  {
-                    "title": "Second type of object",
-                    "type": "object",
-                    "properties": {
-                      "c": {
-                        "type": "string"
-                      },
-                      "d": {
-                        "type": "string"
-                      }
-                    }
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "/anything/one-of-primitive": {
-      "post": {
-        "summary": "oneOf primitive",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "oneOf": [
-                  {
-                    "title": "First type of primitive",
-                    "type": "string"
-                  },
-                  {
-                    "title": "Second type of primitive",
-                    "type": "integer"
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "/anything/one-of-object-ref": {
-      "post": {
-        "summary": "oneOf object with $ref pointers",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "oneOf": [
-                  {
-                    "$ref": "#/components/schemas/object1"
-                  },
-                  {
-                    "$ref": "#/components/schemas/object2"
-                  }
-                ]
-              }
-            }
-          }
-        }
-      }
-    },
-    "/anything/nested-one-of-object-ref": {
-      "post": {
-        "summary": "nested oneOf object with $ref pointers",
-        "description": "",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "config": {
-                    "oneOf": [
-                      {
-                        "$ref": "#/components/schemas/object1"
-                      },
-                      {
-                        "$ref": "#/components/schemas/object2"
-                      }
-                    ]
-                  }
-                },
-                "additionalProperties": false
-              }
-            }
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "schemas": {
-      "object1": {
-        "title": "First type of object",
-        "type": "object",
-        "properties": {
-          "a": {
-            "type": "string"
-          },
-          "b": {
-            "type": "string"
-          }
-        }
-      },
-      "object2": {
-        "title": "Second type of object",
-        "type": "object",
-        "properties": {
-          "c": {
-            "type": "string"
-          },
-          "d": {
-            "type": "string"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/example/swagger-files/parameters-with-refs.json b/example/swagger-files/parameters-with-refs.json
index 4974d13f8..00f49e7af 100644
--- a/example/swagger-files/parameters-with-refs.json
+++ b/example/swagger-files/parameters-with-refs.json
@@ -37,6 +37,16 @@
           }
         ],
         "responses": {}
+      },
+      "put": {
+        "summary": "Query param pointing to a $ref that has an escaped ~1 slash",
+        "description": "",
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/limit~1Param"
+          }
+        ],
+        "responses": {}
       }
     }
   },
@@ -53,6 +63,18 @@
           "default": 20
         },
         "description": "The numbers of items to return."
+      },
+      "limit/Param": {
+        "in": "query",
+        "name": "limit",
+        "required": false,
+        "schema": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 50,
+          "default": 20
+        },
+        "description": "The numbers of items to return."
       }
     },
     "schemas": {
diff --git a/example/swagger-files/polymorphism.json b/example/swagger-files/polymorphism.json
new file mode 100644
index 000000000..645522c5c
--- /dev/null
+++ b/example/swagger-files/polymorphism.json
@@ -0,0 +1,424 @@
+{
+  "openapi": "3.0.0",
+  "servers": [
+    {
+      "url": "http://httpbin.org"
+    }
+  ],
+  "info": {
+    "version": "1.0.0",
+    "title": "polymorphism support"
+  },
+  "paths": {
+    "/pets": {
+      "patch": {
+        "summary": "oneOf request with a nested allOf",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/Cat"
+                  },
+                  {
+                    "$ref": "#/components/schemas/Dog"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "pet_type"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Updated"
+          }
+        }
+      }
+    },
+    "/anything/all-of-object": {
+      "post": {
+        "summary": "allOf with listed objects",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "allOf": [
+                  {
+                    "title": "First type of object",
+                    "type": "object",
+                    "properties": {
+                      "a": {
+                        "type": "string"
+                      },
+                      "b": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  {
+                    "title": "Second type of object",
+                    "type": "object",
+                    "properties": {
+                      "c": {
+                        "type": "string"
+                      },
+                      "d": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/anything/any-of-object": {
+      "post": {
+        "summary": "anyOf object",
+        "description": "",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "anyOf": [
+                  {
+                    "title": "First type of object",
+                    "type": "object",
+                    "properties": {
+                      "a": {
+                        "type": "string"
+                      },
+                      "b": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  {
+                    "title": "Second type of object",
+                    "type": "object",
+                    "properties": {
+                      "c": {
+                        "type": "string"
+                      },
+                      "d": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "/anything/any-of-primitive": {
+      "post": {
+        "summary": "anyOf primitive",
+        "description": "",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "anyOf": [
+                  {
+                    "title": "First type of primitive",
+                    "type": "string"
+                  },
+                  {
+                    "title": "Second type of primitive",
+                    "type": "integer"
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "/anything/one-of-object": {
+      "post": {
+        "summary": "oneOf object",
+        "description": "",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "title": "First type of object",
+                    "type": "object",
+                    "properties": {
+                      "a": {
+                        "type": "string"
+                      },
+                      "b": {
+                        "type": "string"
+                      }
+                    }
+                  },
+                  {
+                    "title": "Second type of object",
+                    "type": "object",
+                    "properties": {
+                      "c": {
+                        "type": "string"
+                      },
+                      "d": {
+                        "type": "string"
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "/anything/one-of-primitive": {
+      "post": {
+        "summary": "oneOf primitive",
+        "description": "",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "title": "First type of primitive",
+                    "type": "string"
+                  },
+                  {
+                    "title": "Second type of primitive",
+                    "type": "integer"
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "/anything/one-of-object-ref": {
+      "post": {
+        "summary": "oneOf object with $ref pointers",
+        "description": "",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/object1"
+                  },
+                  {
+                    "$ref": "#/components/schemas/object2"
+                  }
+                ]
+              }
+            }
+          }
+        }
+      }
+    },
+    "/anything/nested-one-of-object-ref": {
+      "post": {
+        "summary": "nested oneOf object with $ref pointers",
+        "description": "",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "config": {
+                    "oneOf": [
+                      {
+                        "$ref": "#/components/schemas/object1"
+                      },
+                      {
+                        "$ref": "#/components/schemas/object2"
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          }
+        }
+      }
+    },
+    "/anything/nested-one-of-ref": {
+      "post": {
+        "description": "Use case for https://github.com/readmeio/api-explorer/issues/495",
+        "requestBody": {
+          "$ref": "#/components/requestBodies/nested-one-of-ref"
+        }
+      }
+    },
+    "/anything/nested-one-of-object-with-nested-one-of": {
+      "post": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "config": {
+                    "oneOf": [
+                      {
+                        "$ref": "#/components/schemas/object1"
+                      },
+                      {
+                        "$ref": "#/components/schemas/object2"
+                      },
+                      {
+                        "oneOf": [
+                          {
+                            "$ref": "#/components/schemas/Cat"
+                          },
+                          {
+                            "$ref": "#/components/schemas/Dog"
+                          }
+                        ],
+                        "discriminator": {
+                          "propertyName": "pet_type"
+                        }
+                      }
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "requestBodies": {
+      "nested-one-of-ref": {
+        "required": true,
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object",
+              "properties": {
+                "config": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/string1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/string2"
+                    }
+                  ]
+                }
+              },
+              "additionalProperties": false
+            }
+          }
+        }
+      }
+    },
+    "schemas": {
+      "Pet": {
+        "type": "object",
+        "required": [
+          "pet_type"
+        ],
+        "properties": {
+          "pet_type": {
+            "type": "string"
+          }
+        },
+        "discriminator": {
+          "propertyName": "pet_type"
+        }
+      },
+      "Dog": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/Pet"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "bark": {
+                "type": "boolean"
+              },
+              "breed": {
+                "type": "string",
+                "enum": ["Dingo", "Husky", "Retriever", "Shepherd"]
+              }
+            }
+          }
+        ]
+      },
+      "Cat": {
+        "type": "object",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/Pet"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "hunts": {
+                "type": "boolean"
+              },
+              "age": {
+                "type": "integer"
+              }
+            }
+          }
+        ]
+      },
+      "object1": {
+        "title": "First type of object",
+        "type": "object",
+        "properties": {
+          "a": {
+            "type": "string"
+          },
+          "b": {
+            "type": "string"
+          }
+        }
+      },
+      "object2": {
+        "title": "Second type of object",
+        "type": "object",
+        "properties": {
+          "c": {
+            "type": "string"
+          },
+          "d": {
+            "type": "string"
+          }
+        }
+      },
+      "string1": {
+        "type": "string"
+      },
+      "string2": {
+        "type": "string"
+      }
+    }
+  }
+}
diff --git a/example/swagger-files/types.json b/example/swagger-files/types.json
index dccdbfb3d..a73e5486e 100644
--- a/example/swagger-files/types.json
+++ b/example/swagger-files/types.json
@@ -67,10 +67,10 @@
                     "type": "string",
                     "format": "binary"
                   },
-                  "string (format: json)": {
-                    "description": "This is a special ReadMe type to render a <textarea> to be parsed as JSON",
+                  "string (format: blob)": {
+                    "description": "Strings with `format: blob` should render a `<textarea>`.",
                     "type": "string",
-                    "format": "json"
+                    "format": "blob"
                   },
                   "string (format: date)": {
                     "type": "string",
@@ -81,6 +81,16 @@
                     "type": "string",
                     "format": "date-time"
                   },
+                  "string (format: html)": {
+                    "description": "Strings with `format: html` should render a `<textarea>`.",
+                    "type": "string",
+                    "format": "html"
+                  },
+                  "string (format: json)": {
+                    "description": "This is a special ReadMe type to render a `<textarea>` to be parsed as JSON",
+                    "type": "string",
+                    "format": "json"
+                  },
                   "string (format: string)": {
                     "type": "string",
                     "format": "string"
diff --git a/jest.config.js b/jest.config.js
index 04f3d0274..2790127b0 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -14,8 +14,10 @@ module.exports = {
   setupFiles: [path.join(__dirname, '/lib/enzyme')],
   coveragePathIgnorePatterns: ['<rootDir>/webpack.*.js', '<rootDir>/src/form-components', 'dist/'],
   collectCoverageFrom: ['**/*.{js,jsx}', '!**/node_modules/**', '!jest.config.js', '!**/coverage/lcov-report/**'],
+  moduleNameMapper: {
+    '.+\\.(css|styl|less|sass|scss)$': 'identity-obj-proxy',
+  },
   transform: {
     '^.+\\.jsx?$': path.join(__dirname, '/lib/babel-jest'),
-    '.+\\.(css|styl|less|sass|scss)$': 'jest-transform-css',
   },
 };
diff --git a/package-lock.json b/package-lock.json
index f10354144..23b14d478 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6018,12 +6018,6 @@
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
-    "common-tags": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
-      "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==",
-      "dev": true
-    },
     "commondir": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -6649,29 +6643,6 @@
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
       "dev": true
     },
-    "cosmiconfig": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.0.6.tgz",
-      "integrity": "sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==",
-      "dev": true,
-      "requires": {
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.9.0",
-        "parse-json": "^4.0.0"
-      },
-      "dependencies": {
-        "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"
-          }
-        }
-      }
-    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
@@ -6760,135 +6731,6 @@
         "schema-utils": "^2.6.0"
       }
     },
-    "css-modules-loader-core": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz",
-      "integrity": "sha1-WQhmgpShvs0mGuCkziGwtVHyHRY=",
-      "dev": true,
-      "requires": {
-        "icss-replace-symbols": "1.1.0",
-        "postcss": "6.0.1",
-        "postcss-modules-extract-imports": "1.1.0",
-        "postcss-modules-local-by-default": "1.2.0",
-        "postcss-modules-scope": "1.1.0",
-        "postcss-modules-values": "1.3.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-              "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-              "dev": true
-            }
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "postcss": {
-          "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz",
-          "integrity": "sha1-AA29H47vIXqjaLmiEsX8QLKo8/I=",
-          "dev": true,
-          "requires": {
-            "chalk": "^1.1.3",
-            "source-map": "^0.5.6",
-            "supports-color": "^3.2.3"
-          }
-        },
-        "postcss-modules-extract-imports": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz",
-          "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=",
-          "dev": true,
-          "requires": {
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-modules-local-by-default": {
-          "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz",
-          "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=",
-          "dev": true,
-          "requires": {
-            "css-selector-tokenizer": "^0.7.0",
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-modules-scope": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz",
-          "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=",
-          "dev": true,
-          "requires": {
-            "css-selector-tokenizer": "^0.7.0",
-            "postcss": "^6.0.1"
-          }
-        },
-        "postcss-modules-values": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz",
-          "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=",
-          "dev": true,
-          "requires": {
-            "icss-replace-symbols": "^1.1.0",
-            "postcss": "^6.0.1"
-          }
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
     "css-select": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
@@ -6901,57 +6743,6 @@
         "nth-check": "~1.0.1"
       }
     },
-    "css-selector-tokenizer": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz",
-      "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==",
-      "dev": true,
-      "requires": {
-        "cssesc": "^0.1.0",
-        "fastparse": "^1.1.1",
-        "regexpu-core": "^1.0.0"
-      },
-      "dependencies": {
-        "cssesc": {
-          "version": "0.1.0",
-          "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz",
-          "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=",
-          "dev": true
-        },
-        "jsesc": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
-          "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
-          "dev": true
-        },
-        "regexpu-core": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz",
-          "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=",
-          "dev": true,
-          "requires": {
-            "regenerate": "^1.2.1",
-            "regjsgen": "^0.2.0",
-            "regjsparser": "^0.1.4"
-          }
-        },
-        "regjsgen": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
-          "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=",
-          "dev": true
-        },
-        "regjsparser": {
-          "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
-          "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-          "dev": true,
-          "requires": {
-            "jsesc": "~0.5.0"
-          }
-        }
-      }
-    },
     "css-what": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
@@ -8877,12 +8668,6 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "fastparse": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz",
-      "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==",
-      "dev": true
-    },
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
@@ -9453,41 +9238,6 @@
         "globule": "^1.0.0"
       }
     },
-    "generic-names": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/generic-names/-/generic-names-1.0.3.tgz",
-      "integrity": "sha1-LXhqEhruUIh2eWk56OO/+DbCCRc=",
-      "dev": true,
-      "requires": {
-        "loader-utils": "^0.2.16"
-      },
-      "dependencies": {
-        "big.js": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
-          "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==",
-          "dev": true
-        },
-        "json5": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
-          "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "0.2.17",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-          "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
-          "dev": true,
-          "requires": {
-            "big.js": "^3.1.3",
-            "emojis-list": "^2.0.0",
-            "json5": "^0.5.0",
-            "object-assign": "^4.0.1"
-          }
-        }
-      }
-    },
     "genfun": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/genfun/-/genfun-5.0.0.tgz",
@@ -10218,6 +9968,12 @@
         }
       }
     },
+    "harmony-reflect": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz",
+      "integrity": "sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA==",
+      "dev": true
+    },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -10699,12 +10455,6 @@
         "safer-buffer": ">= 2.1.2 < 3"
       }
     },
-    "icss-replace-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
-      "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
-      "dev": true
-    },
     "icss-utils": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
@@ -10714,6 +10464,15 @@
         "postcss": "^7.0.14"
       }
     },
+    "identity-obj-proxy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz",
+      "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
+      "dev": true,
+      "requires": {
+        "harmony-reflect": "^1.4.6"
+      }
+    },
     "ieee754": {
       "version": "1.1.13",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
@@ -10741,15 +10500,6 @@
         "minimatch": "^3.0.4"
       }
     },
-    "import-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
-      "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
-      "dev": true,
-      "requires": {
-        "import-from": "^2.1.0"
-      }
-    },
     "import-fresh": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
@@ -10768,23 +10518,6 @@
         }
       }
     },
-    "import-from": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
-      "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
-      "dev": true,
-      "requires": {
-        "resolve-from": "^3.0.0"
-      },
-      "dependencies": {
-        "resolve-from": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-          "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
-          "dev": true
-        }
-      }
-    },
     "import-local": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
@@ -11534,20 +11267,6 @@
       "integrity": "sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA==",
       "dev": true
     },
-    "jest-transform-css": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-transform-css/-/jest-transform-css-2.0.0.tgz",
-      "integrity": "sha512-KV5pD27qUltAVj0mZEVvqd+Ahe+WNPOVWKA1BRpIhBJ5OeUUOM46ivAznJrC5B1JrVNbMzWjPxnKl6QTsAAT3Q==",
-      "dev": true,
-      "requires": {
-        "common-tags": "1.8.0",
-        "cosmiconfig": "5.0.6",
-        "cross-spawn": "6.0.5",
-        "postcss-load-config": "2.0.0",
-        "postcss-modules": "1.3.2",
-        "style-inject": "0.3.0"
-      }
-    },
     "jest-util": {
       "version": "25.1.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz",
@@ -14213,53 +13932,6 @@
         }
       }
     },
-    "postcss-load-config": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.0.0.tgz",
-      "integrity": "sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==",
-      "dev": true,
-      "requires": {
-        "cosmiconfig": "^4.0.0",
-        "import-cwd": "^2.0.0"
-      },
-      "dependencies": {
-        "cosmiconfig": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-4.0.0.tgz",
-          "integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
-          "dev": true,
-          "requires": {
-            "is-directory": "^0.3.1",
-            "js-yaml": "^3.9.0",
-            "parse-json": "^4.0.0",
-            "require-from-string": "^2.0.1"
-          }
-        },
-        "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"
-          }
-        }
-      }
-    },
-    "postcss-modules": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/postcss-modules/-/postcss-modules-1.3.2.tgz",
-      "integrity": "sha512-QujH5ZpPtr1fBWTKDa43Hx45gm7p19aEtHaAtkMCBZZiB/D5za2wXSMtAf94tDUZHF3F5KZcTXISUNqgEQRiDw==",
-      "dev": true,
-      "requires": {
-        "css-modules-loader-core": "^1.1.0",
-        "generic-names": "^1.0.3",
-        "lodash.camelcase": "^4.3.0",
-        "postcss": "^7.0.1",
-        "string-hash": "^1.1.1"
-      }
-    },
     "postcss-modules-extract-imports": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
@@ -15322,12 +14994,6 @@
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
-    "require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
-    },
     "require-main-filename": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
@@ -16955,12 +16621,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string-hash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz",
-      "integrity": "sha1-6Kr8CsGFW0Zmkp7X3RJ1311sgRs=",
-      "dev": true
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -17207,12 +16867,6 @@
         "through": "^2.3.4"
       }
     },
-    "style-inject": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz",
-      "integrity": "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==",
-      "dev": true
-    },
     "style-loader": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-1.1.3.tgz",
diff --git a/package.json b/package.json
index 8e063ab01..44132fec9 100644
--- a/package.json
+++ b/package.json
@@ -5,16 +5,18 @@
   "scripts": {
     "heroku-postbuild": "npm run bootstrap && node scripts/update-example-swagger-files && npm run build",
     "bootstrap": "lerna bootstrap",
-    "build": "./build.sh & lerna run build",
+    "build": "./build.sh; lerna run build",
     "clean": "lerna clean",
     "deploy": "gh-pages --dotfiles -d example/dist",
-    "lint": "eslint example lib *.js --ext js --ext jsx",
+    "lint": "eslint example example/ lib/ scripts/ *.js --ext js --ext jsx",
     "publish": "lerna publish",
-    "start": "node scripts/update-example-swagger-files && webpack-dev-server",
-    "test": "node scripts/update-example-swagger-files && npm run lint && lerna run test --stream",
-    "update:emojis": "rm -rf example/img/emojis && mkdir example/img/emojis && cp packages/markdown/node_modules/@readme/emojis/src/img/* example/img/emojis",
+    "pretest": "npm run update:examples; npm run lint",
+    "start": "npm run update:examples; webpack-dev-server --open",
+    "test": "lerna run test --stream",
+    "update:emojis": "rm -rf example/img/emojis; mkdir example/img/emojis; cp packages/markdown/node_modules/@readme/emojis/src/img/* example/img/emojis",
+    "update:examples": "node scripts/update-example-swagger-files",
     "watch": "lerna run watch --stream",
-    "version": "auto-changelog -v $(node -e \"console.log('v' + require('./lerna.json').version)\") && git add CHANGELOG.md"
+    "version": "auto-changelog -v $(node -e \"console.log('v' + require('./lerna.json').version)\"); git add CHANGELOG.md"
   },
   "publishConfig": {
     "registry": "http://registry.npmjs.org"
@@ -42,7 +44,7 @@
     "enzyme-adapter-react-16": "^1.3.0",
     "eslint": "^6.5.0",
     "gh-pages": "^2.1.1",
-    "jest-transform-css": "^2.0.0",
+    "identity-obj-proxy": "^3.0.0",
     "lerna": "^3.14.1",
     "node-sass": "^4.12.0",
     "prettier": "^1.19.1",
diff --git a/packages/api-explorer/__tests__/AuthBox.test.jsx b/packages/api-explorer/__tests__/AuthBox.test.jsx
index a74b9313d..f0d2cac93 100644
--- a/packages/api-explorer/__tests__/AuthBox.test.jsx
+++ b/packages/api-explorer/__tests__/AuthBox.test.jsx
@@ -4,7 +4,7 @@ const Oas = require('@readme/oas-tooling');
 
 const AuthBox = require('../src/AuthBox');
 
-const multipleSecurities = require('./fixtures/multiple-securities/oas');
+const multipleSecurities = require('./__fixtures__/multiple-securities/oas');
 
 const oas = new Oas(multipleSecurities);
 
@@ -13,8 +13,8 @@ const props = {
   oauth: false,
   open: false,
   operation: oas.operation('/or-security', 'post'),
+  onAuthGroupChange: () => {},
   onChange: () => {},
-  onGroupChange: () => {},
   onSubmit: () => {},
   toggle: () => {},
 };
@@ -87,12 +87,12 @@ describe('group selection', () => {
   });
 
   it('should update auth on changes', () => {
-    const comp = mount(<AuthBox {...props} {...groupProps} onGroupChange={jest.fn()} />);
+    const comp = mount(<AuthBox {...props} {...groupProps} onAuthGroupChange={jest.fn()} />);
 
     const select = comp.find('select');
     select.instance().value = '7000';
     select.simulate('change');
 
-    expect(comp.props().onGroupChange).toHaveBeenCalledWith('7000');
+    expect(comp.props().onAuthGroupChange).toHaveBeenCalledWith('7000');
   });
 });
diff --git a/packages/api-explorer/__tests__/Doc.test.jsx b/packages/api-explorer/__tests__/Doc.test.jsx
index 178081f40..a14510d59 100644
--- a/packages/api-explorer/__tests__/Doc.test.jsx
+++ b/packages/api-explorer/__tests__/Doc.test.jsx
@@ -1,29 +1,33 @@
 const extensions = require('@readme/oas-extensions');
 const { Request, Response } = require('node-fetch');
+const shortid = require('shortid');
 
 global.Request = Request;
 
 const React = require('react');
 const { shallow, mount } = require('enzyme');
 const Doc = require('../src/Doc');
-const oas = require('./fixtures/petstore/circular-oas');
-const multipleSecurities = require('./fixtures/multiple-securities/oas');
+const ErrorBoundary = require('../src/ErrorBoundary');
+
+const petstore = require('@readme/oas-examples/3.0/json/petstore.json');
+const petstoreWithAuth = require('./__fixtures__/petstore/oas.json');
+const multipleSecurities = require('./__fixtures__/multiple-securities/oas.json');
 
 const props = {
   auth: {},
   doc: {
     api: { method: 'get' },
     formData: { path: { petId: '1' }, auth: { api_key: '' } },
-    onSubmit: () => {},
     slug: 'slug',
     swagger: { path: '/pet/{petId}' },
     title: 'Title',
     type: 'endpoint',
   },
   language: 'node',
-  oas,
+  oas: petstore,
   oauth: false,
   onAuthChange: () => {},
+  onAuthGroupChange: () => {},
   setLanguage: () => {},
   onDocRender: () => {},
   suggestedEdits: false,
@@ -45,10 +49,9 @@ test('should output a div', () => {
   expect(doc.find('.hub-api')).toHaveLength(1);
   expect(doc.find('PathUrl')).toHaveLength(1);
   expect(doc.find('CodeSample')).toHaveLength(1);
-  // This test needs the component to be `mount()`ed
-  // but for some reason when I mount in this test
-  // it makes the test below that uses `jest.useFakeTimers()`
-  // fail ¯\_(ツ)_/¯. Skipping for now
+
+  // This test needs the component to be `mount()`ed but for some reason when I mount in this test it makes the test
+  // below that uses `jest.useFakeTimers()` fail ¯\_(ツ)_/¯. Skipping for now.
   // expect(doc.find('Params').length).toBe(1);
   expect(doc.find('Content')).toHaveLength(1);
 });
@@ -67,14 +70,19 @@ test('should render straight away if `appearance.splitReferenceDocs` is true', (
 });
 
 test('should render a manual endpoint', () => {
-  const myProps = JSON.parse(JSON.stringify(props));
-  const onRender = () => {};
-
-  myProps.doc.swagger.path = '/nonexistant';
-  myProps.doc.api.examples = {
+  // Transforming `props` like this is weird, but without it some auth timer tests will break. 🤷‍♂️
+  const manualProps = JSON.parse(JSON.stringify(props));
+  manualProps.onAuthChange = () => {};
+  manualProps.onAuthGroupChange = () => {};
+  manualProps.onRender = () => {};
+  manualProps.onDocRender = () => {};
+  manualProps.setLanguage = () => {};
+  manualProps.tryItMetrics = () => {};
+
+  manualProps.doc.api.examples = {
     codes: [],
   };
-  myProps.doc.api.params = [
+  manualProps.doc.api.params = [
     {
       default: 'test',
       desc: 'test',
@@ -88,11 +96,10 @@ test('should render a manual endpoint', () => {
 
   const doc = mount(
     <Doc
-      {...myProps}
+      {...manualProps}
       appearance={{
         splitReferenceDocs: true,
       }}
-      onDocRender={onRender}
     />
   );
 
@@ -109,6 +116,7 @@ test('should work without a doc.swagger/doc.path/oas', () => {
       language="node"
       oauth={false}
       onAuthChange={() => {}}
+      onAuthGroupChange={() => {}}
       onDocRender={() => {}}
       rendered={true}
       setLanguage={() => {}}
@@ -134,6 +142,7 @@ test('should still display `Content` with column-style layout', () => {
       language="node"
       oauth={false}
       onAuthChange={() => {}}
+      onAuthGroupChange={() => {}}
       onDocRender={() => {}}
       rendered={true}
       setLanguage={() => {}}
@@ -173,7 +182,7 @@ describe('onSubmit', () => {
   it('should display authentication warning if auth is required for endpoint', () => {
     jest.useFakeTimers();
 
-    const doc = mount(<Doc {...props} />);
+    const doc = mount(<Doc {...props} oas={petstoreWithAuth} />);
 
     doc.instance().onSubmit();
     expect(doc.state('showAuthBox')).toBe(true);
@@ -202,13 +211,13 @@ describe('onSubmit', () => {
         onSubmit: () => {},
       },
       language: 'node',
-      oas,
+      oas: petstoreWithAuth,
       oauth: false,
       setLanguage: () => {},
     };
 
     window.fetch = request => {
-      expect(request.url).toContain(oas.servers[0].url);
+      expect(request.url).toContain(petstoreWithAuth.servers[0].url);
       return Promise.resolve(
         new Response(JSON.stringify({ id: 1 }), {
           headers: { 'content-type': 'application/json' },
@@ -319,7 +328,7 @@ describe('suggest edits', () => {
 
 describe('Response Schema', () => {
   it('should render Response Schema if endpoint does have a response', () => {
-    const doc = mount(<Doc {...props} />);
+    const doc = mount(<Doc {...props} oas={petstoreWithAuth} />);
     doc.setState({ showEndpoint: true });
     expect(doc.find('ResponseSchema')).toHaveLength(1);
   });
@@ -334,7 +343,6 @@ describe('Response Schema', () => {
           type: 'endpoint',
           swagger: { path: '/unknown-scheme' },
           api: { method: 'post' },
-          onSubmit: () => {},
         }}
         oas={multipleSecurities}
       />
@@ -346,7 +354,7 @@ describe('Response Schema', () => {
 describe('RenderLogs', () => {
   it('should return a log component', () => {
     const doc = mount(<Doc {...props} />);
-    doc.setProps({ Logs: {} });
+    doc.setProps({ Logs: () => {} });
     const res = doc.instance().renderLogs();
     expect(typeof res).toBe('object');
   });
@@ -362,7 +370,7 @@ describe('themes', () => {
   });
 });
 
-test('should output with an error message if the endpoint fails to load', () => {
+describe('error handling', () => {
   const brokenOas = {
     paths: {
       '/path': {
@@ -375,21 +383,77 @@ test('should output with an error message if the endpoint fails to load', () =>
     },
   };
 
-  const doc = mount(
-    <Doc
-      {...props}
-      doc={{
-        title: 'title',
-        slug: 'slug',
-        type: 'endpoint',
-        swagger: { path: '/path' },
-        api: { method: 'post' },
-      }}
-      oas={brokenOas}
-    />
-  );
+  const docProps = {
+    title: 'title',
+    slug: 'slug',
+    type: 'endpoint',
+    swagger: { path: '/path' },
+    api: { method: 'post' },
+  };
 
-  doc.setState({ showEndpoint: true });
+  const spy = jest.spyOn(shortid, 'generate');
+  const originalConsole = console;
+
+  // We're testing errors here, so we don't need `console.error` logs spamming the test output.
+  beforeEach(() => {
+    // eslint-disable-next-line no-console
+    console.error = () => {};
+  });
+
+  afterEach(() => {
+    // eslint-disable-next-line no-console
+    console.error = originalConsole.error;
+  });
 
-  expect(doc.find('EndpointErrorBoundary')).toHaveLength(1);
+  it('should output with a masked error message if the endpoint fails to load', () => {
+    const doc = mount(<Doc {...props} doc={docProps} maskErrorMessages={true} oas={brokenOas} />);
+
+    doc.setState({ showEndpoint: true });
+
+    const html = doc.html();
+
+    expect(spy).toHaveBeenCalled();
+    expect(doc.find(ErrorBoundary)).toHaveLength(1);
+    expect(html).not.toMatch('support@readme.io');
+    expect(html).toMatch("endpoint's documentation");
+  });
+
+  describe('support-focused error messaging', () => {
+    it('should output with an error message if the endpoint fails to load, with a unique error event id', () => {
+      const doc = mount(<Doc {...props} doc={docProps} maskErrorMessages={false} oas={brokenOas} />);
+
+      doc.setState({ showEndpoint: true });
+
+      const html = doc.html();
+
+      expect(spy).toHaveBeenCalled();
+      expect(doc.find(ErrorBoundary)).toHaveLength(1);
+      expect(html).toMatch('support@readme.io');
+      expect(html).toMatch("endpoint's documentation");
+    });
+  });
+
+  it('should output with an error message if the endpoint fails to load, with a defined error event id', () => {
+    const doc = mount(
+      <Doc
+        {...props}
+        doc={docProps}
+        maskErrorMessages={false}
+        oas={brokenOas}
+        onError={() => {
+          return 'API-EXPLORER-1';
+        }}
+      />
+    );
+
+    doc.setState({ showEndpoint: true });
+
+    const html = doc.html();
+
+    expect(spy).toHaveBeenCalled();
+    expect(doc.find(ErrorBoundary)).toHaveLength(1);
+    expect(html).toMatch('support@readme.io');
+    expect(html).toMatch("endpoint's documentation");
+    expect(html).toMatch('API-EXPLORER-1');
+  });
 });
diff --git a/packages/api-explorer/__tests__/ExampleTabs.test.jsx b/packages/api-explorer/__tests__/ExampleTabs.test.jsx
index d23794c7e..d71526e21 100644
--- a/packages/api-explorer/__tests__/ExampleTabs.test.jsx
+++ b/packages/api-explorer/__tests__/ExampleTabs.test.jsx
@@ -2,7 +2,7 @@ const React = require('react');
 const { shallow, mount } = require('enzyme');
 const Oas = require('@readme/oas-tooling');
 
-const example = require('./fixtures/example-results/oas');
+const example = require('./__fixtures__/example-results/oas');
 
 const ExampleTabs = require('../src/ExampleTabs');
 const showCodeResults = require('../src/lib/show-code-results');
diff --git a/packages/api-explorer/__tests__/Params.test.jsx b/packages/api-explorer/__tests__/Params.test.jsx
index 365ed3ee8..ac5d8c8b7 100644
--- a/packages/api-explorer/__tests__/Params.test.jsx
+++ b/packages/api-explorer/__tests__/Params.test.jsx
@@ -2,15 +2,17 @@ const React = require('react');
 const { mount } = require('enzyme');
 const extensions = require('@readme/oas-extensions');
 const Oas = require('@readme/oas-tooling');
-const { ADDITIONAL_PROPERTY_FLAG } = require('react-jsonschema-form/lib/utils');
+const { ADDITIONAL_PROPERTY_FLAG } = require('@readme/react-jsonschema-form/lib/utils');
 
 const Description = require('../src/form-components/DescriptionField');
 const createParams = require('../src/Params');
 
 const { Operation } = Oas;
-const petstore = require('./fixtures/petstore/oas.json');
-const boolean = require('./fixtures/boolean/oas.json');
-const string = require('./fixtures/string/oas.json');
+const petstore = require('./__fixtures__/petstore/oas.json');
+const boolean = require('./__fixtures__/boolean/oas.json');
+const string = require('./__fixtures__/string/oas.json');
+const polymorphism = require('./__fixtures__/polymorphism/oas.json');
+const polymorphismNestedOneOfRef = require('./__fixtures__/polymorphism/oneof-nested-ref.json');
 
 const oas = new Oas(petstore);
 const operation = oas.operation('/pet/{petId}', 'get');
@@ -54,6 +56,7 @@ function renderParams(schema, customProps) {
         {...customProps}
         operation={
           new Operation(oas, '/path', 'post', {
+            operationId: 'createPath',
             requestBody: {
               content: {
                 'application/json': {
@@ -74,7 +77,7 @@ function renderParams(schema, customProps) {
 }
 
 describe('form id attribute', () => {
-  it('should be set to the operationId', () => {
+  it('should be set to the schema type+operationId', () => {
     expect(
       mount(
         <div>
@@ -82,7 +85,7 @@ describe('form id attribute', () => {
         </div>
       )
         .html()
-        .match(new RegExp(`form-${operation.operationId}`, 'g'))
+        .match(new RegExp(`form-path-${operation.operationId}`, 'g'))
     ).toHaveLength(1);
   });
 });
@@ -159,21 +162,79 @@ test('additionalProperties object labels (keys) should be editable', () => {
     [ADDITIONAL_PROPERTY_FLAG]: true,
   });
 
-  expect(params.find('input#root_a-key')).toHaveLength(1);
+  expect(params.find('input#createPath_a-key')).toHaveLength(1);
+});
+
+test('if no operationId is present, one should be generated', () => {
+  const params = mount(
+    <div>
+      <Params
+        {...props}
+        operation={
+          new Operation(oas, '/path/create', 'post', {
+            requestBody: {
+              content: {
+                'application/json': {
+                  schema: {
+                    type: 'object',
+                  },
+                },
+              },
+            },
+          })
+        }
+      />
+    </div>
+  );
+
+  expect(params.find('form#form-body-postpathcreate')).toHaveLength(1);
+});
+
+describe('oneOf/anyOf', () => {
+  it('should render the select container with our CustomTemplateShell component', () => {
+    const testOas = new Oas(polymorphism);
+
+    const params = mount(
+      <div>
+        <Params {...props} oas={testOas} operation={testOas.operation('/pets', 'patch')} />
+      </div>
+    );
+
+    // This might look like a weird assertion, but RJSF returns `undefined` for oneOf and anyOf schemas, so if we have
+    // that here, it means that we loaded it with our CustomTemplateShell component in SchemaField.
+    expect(params.find('div.field.field-undefined.param')).toHaveLength(1);
+  });
+
+  // https://github.com/readmeio/api-explorer/issues/495
+  it('should not error on a oneOf $ref nested inside another object', () => {
+    const testOas = new Oas(polymorphismNestedOneOfRef);
+
+    const params = mount(
+      <div>
+        <Params {...props} oas={testOas} operation={testOas.operation('/post', 'post')} />
+      </div>
+    );
+
+    expect(params.html()).not.toMatch('Unknown field type undefined');
+  });
 });
 
 describe('schema format handling', () => {
   describe('string types', () => {
-    it('json should render as <textarea>', () => {
+    it.each([
+      ['json', jsonOperation, 'json'],
+      ['blob', stringOas.operation('/format-blob', 'get'), 'blob'],
+      ['html', stringOas.operation('/format-html', 'get'), 'html'],
+    ])(`%s should render as <textarea>`, (type, stringOperation, label) => {
       const params = mount(
         <div>
-          <Params {...props} operation={jsonOperation} />
+          <Params {...props} operation={stringOperation} />
         </div>
       );
 
       expect(params.find('textarea')).toHaveLength(1);
-      expect(params.find('.field-json')).toHaveLength(1);
-      expect(params.find('span.label-type').text()).toBe('json');
+      expect(params.find(`.field-${type}`)).toHaveLength(1);
+      expect(params.find('span.label-type').text()).toBe(label);
     });
 
     it('binary should render as <input type="file">', () => {
@@ -188,10 +249,10 @@ describe('schema format handling', () => {
     });
 
     it.each([
-      ['password', 'password', stringOas.operation('/format-password', 'get'), 'password'],
       ['date', 'text', stringOas.operation('/format-date', 'get'), 'date'],
       ['date-time', 'text', stringOas.operation('/format-date-time', 'get'), 'string'],
       ['dateTime', 'text', stringOas.operation('/format-dateTime', 'get'), 'string'],
+      ['password', 'password', stringOas.operation('/format-password', 'get'), 'password'],
       ['uri', 'url', stringOas.operation('/format-uri', 'get'), 'uri'],
       ['url', 'url', stringOas.operation('/format-url', 'get'), 'url'],
     ])(`%s should render as <input type="%s">`, (type, inputType, stringOperation, label) => {
diff --git a/packages/api-explorer/__tests__/PathUrl.test.jsx b/packages/api-explorer/__tests__/PathUrl.test.jsx
index 569eb051a..69d5c9f4b 100644
--- a/packages/api-explorer/__tests__/PathUrl.test.jsx
+++ b/packages/api-explorer/__tests__/PathUrl.test.jsx
@@ -7,7 +7,7 @@ const PathUrl = require('../src/PathUrl');
 const { splitPath } = PathUrl;
 
 const { Operation } = Oas;
-const petstore = require('./fixtures/petstore/oas');
+const petstore = require('./__fixtures__/petstore/oas');
 
 const oas = new Oas(petstore);
 
@@ -17,6 +17,7 @@ const props = {
   loading: false,
   oas,
   oauth: false,
+  onAuthGroupChange: () => {},
   onChange: () => {},
   onSubmit: () => {},
   operation: oas.operation('/pet/{petId}', 'get'),
diff --git a/packages/api-explorer/__tests__/Response.test.jsx b/packages/api-explorer/__tests__/Response.test.jsx
index 222ca0286..17bc35110 100644
--- a/packages/api-explorer/__tests__/Response.test.jsx
+++ b/packages/api-explorer/__tests__/Response.test.jsx
@@ -2,7 +2,7 @@ const React = require('react');
 const { shallow, mount } = require('enzyme');
 const Oas = require('@readme/oas-tooling');
 
-const petstore = require('./fixtures/petstore/oas');
+const petstore = require('./__fixtures__/petstore/oas');
 
 const Response = require('../src/Response');
 
diff --git a/packages/api-explorer/__tests__/ResponseBody.test.jsx b/packages/api-explorer/__tests__/ResponseBody.test.jsx
index 127bfc6db..41e1237f4 100644
--- a/packages/api-explorer/__tests__/ResponseBody.test.jsx
+++ b/packages/api-explorer/__tests__/ResponseBody.test.jsx
@@ -3,7 +3,7 @@ const { mount } = require('enzyme');
 const FetchResponse = require('node-fetch').Response;
 const Oas = require('@readme/oas-tooling');
 
-const petstore = require('./fixtures/petstore/oas');
+const petstore = require('./__fixtures__/petstore/oas');
 
 const parseResponse = require('../src/lib/parse-response');
 const ResponseBody = require('../src/ResponseBody');
diff --git a/packages/api-explorer/__tests__/ResponseExample.test.jsx b/packages/api-explorer/__tests__/ResponseExample.test.jsx
index 8df93bc11..17887901f 100644
--- a/packages/api-explorer/__tests__/ResponseExample.test.jsx
+++ b/packages/api-explorer/__tests__/ResponseExample.test.jsx
@@ -3,9 +3,9 @@ const { shallow } = require('enzyme');
 const extensions = require('@readme/oas-extensions');
 const Oas = require('@readme/oas-tooling');
 
-const petstore = require('./fixtures/petstore/oas');
-const string = require('./fixtures/string/oas.json');
-const exampleResults = require('./fixtures/example-results/oas');
+const petstore = require('./__fixtures__/petstore/oas');
+const string = require('./__fixtures__/string/oas.json');
+const exampleResults = require('./__fixtures__/example-results/oas');
 
 const ResponseExample = require('../src/ResponseExample');
 
diff --git a/packages/api-explorer/__tests__/ResponseSchema.test.jsx b/packages/api-explorer/__tests__/ResponseSchema.test.jsx
index f44b51027..ab237042b 100644
--- a/packages/api-explorer/__tests__/ResponseSchema.test.jsx
+++ b/packages/api-explorer/__tests__/ResponseSchema.test.jsx
@@ -3,7 +3,7 @@ const { shallow } = require('enzyme');
 const Oas = require('@readme/oas-tooling');
 
 const ResponseSchema = require('../src/ResponseSchema');
-const petstore = require('./fixtures/petstore/oas.json');
+const petstore = require('./__fixtures__/petstore/oas.json');
 
 const { Operation } = Oas;
 const oas = new Oas(petstore);
diff --git a/packages/api-explorer/__tests__/ResponseSchemaBody.test.jsx b/packages/api-explorer/__tests__/ResponseSchemaBody.test.jsx
index d46feed7b..b83eceb4f 100644
--- a/packages/api-explorer/__tests__/ResponseSchemaBody.test.jsx
+++ b/packages/api-explorer/__tests__/ResponseSchemaBody.test.jsx
@@ -3,7 +3,7 @@ const { shallow, mount } = require('enzyme');
 const Oas = require('@readme/oas-tooling');
 
 const ResponseSchemaBody = require('../src/ResponseSchemaBody');
-const petstore = require('./fixtures/petstore/oas.json');
+const petstore = require('./__fixtures__/petstore/oas.json');
 
 const oas = new Oas(petstore);
 
diff --git a/packages/api-explorer/__tests__/ResponseTabs.test.jsx b/packages/api-explorer/__tests__/ResponseTabs.test.jsx
index e7bf1eebe..7b4cc814e 100644
--- a/packages/api-explorer/__tests__/ResponseTabs.test.jsx
+++ b/packages/api-explorer/__tests__/ResponseTabs.test.jsx
@@ -3,8 +3,8 @@ const { shallow, mount } = require('enzyme');
 const FetchResponse = require('node-fetch').Response;
 const Oas = require('@readme/oas-tooling');
 
-const petstore = require('./fixtures/petstore/oas');
-const exampleResults = require('./fixtures/example-results/oas');
+const petstore = require('./__fixtures__/petstore/oas');
+const exampleResults = require('./__fixtures__/example-results/oas');
 
 const parseResponse = require('../src/lib/parse-response');
 const ResponseTabs = require('../src/ResponseTabs');
diff --git a/packages/api-explorer/__tests__/fixtures/auth-types/oas.json b/packages/api-explorer/__tests__/__fixtures__/auth-types/oas.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/auth-types/oas.json
rename to packages/api-explorer/__tests__/__fixtures__/auth-types/oas.json
diff --git a/packages/api-explorer/__tests__/fixtures/boolean/oas.json b/packages/api-explorer/__tests__/__fixtures__/boolean/oas.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/boolean/oas.json
rename to packages/api-explorer/__tests__/__fixtures__/boolean/oas.json
diff --git a/packages/api-explorer/__tests__/fixtures/example-results/oas.json b/packages/api-explorer/__tests__/__fixtures__/example-results/oas.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/example-results/oas.json
rename to packages/api-explorer/__tests__/__fixtures__/example-results/oas.json
diff --git a/packages/api-explorer/__tests__/fixtures/example-results/swagger.json b/packages/api-explorer/__tests__/__fixtures__/example-results/swagger.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/example-results/swagger.json
rename to packages/api-explorer/__tests__/__fixtures__/example-results/swagger.json
diff --git a/packages/api-explorer/__tests__/fixtures/multiple-securities/oas.json b/packages/api-explorer/__tests__/__fixtures__/multiple-securities/oas.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/multiple-securities/oas.json
rename to packages/api-explorer/__tests__/__fixtures__/multiple-securities/oas.json
diff --git a/packages/api-explorer/__tests__/fixtures/parameters/common.json b/packages/api-explorer/__tests__/__fixtures__/parameters/common.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/parameters/common.json
rename to packages/api-explorer/__tests__/__fixtures__/parameters/common.json
diff --git a/packages/api-explorer/__tests__/fixtures/petstore/oas.json b/packages/api-explorer/__tests__/__fixtures__/petstore/oas.json
similarity index 99%
rename from packages/api-explorer/__tests__/fixtures/petstore/oas.json
rename to packages/api-explorer/__tests__/__fixtures__/petstore/oas.json
index 863453bde..06ca0f32f 100644
--- a/packages/api-explorer/__tests__/fixtures/petstore/oas.json
+++ b/packages/api-explorer/__tests__/__fixtures__/petstore/oas.json
@@ -19,6 +19,10 @@
       "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
     }
   },
+  "externalDocs": {
+    "description": "Find out more about Swagger",
+    "url": "http://swagger.io"
+  },
   "tags": [
     {
       "name": "pet",
@@ -768,13 +772,6 @@
       }
     }
   },
-  "externalDocs": {
-    "description": "Find out more about Swagger",
-    "url": "http://swagger.io"
-  },
-  "x-explorer-enabled": true,
-  "x-samples-enabled": true,
-  "x-samples-languages": ["curl", "node", "ruby", "javascript", "python"],
   "components": {
     "schemas": {
       "Order": {
diff --git a/packages/api-explorer/__tests__/fixtures/petstore/swagger.json b/packages/api-explorer/__tests__/__fixtures__/petstore/swagger.json
similarity index 100%
rename from packages/api-explorer/__tests__/fixtures/petstore/swagger.json
rename to packages/api-explorer/__tests__/__fixtures__/petstore/swagger.json
diff --git a/packages/api-explorer/__tests__/__fixtures__/polymorphism/oas.json b/packages/api-explorer/__tests__/__fixtures__/polymorphism/oas.json
new file mode 100644
index 000000000..96e79114a
--- /dev/null
+++ b/packages/api-explorer/__tests__/__fixtures__/polymorphism/oas.json
@@ -0,0 +1,99 @@
+{
+  "openapi": "3.0.0",
+  "servers": [
+    {
+      "url": "http://httpbin.org"
+    }
+  ],
+  "info": {
+    "version": "1.0.0",
+    "title": "polymorphism support"
+  },
+  "paths": {
+    "/pets": {
+      "patch": {
+        "summary": "oneOf request with a nested allOf",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "oneOf": [
+                  {
+                    "$ref": "#/components/schemas/Cat"
+                  },
+                  {
+                    "$ref": "#/components/schemas/Dog"
+                  }
+                ],
+                "discriminator": {
+                  "propertyName": "pet_type"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Updated"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "Pet": {
+        "type": "object",
+        "required": [
+          "pet_type"
+        ],
+        "properties": {
+          "pet_type": {
+            "type": "string"
+          }
+        },
+        "discriminator": {
+          "propertyName": "pet_type"
+        }
+      },
+      "Dog": {
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/Pet"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "bark": {
+                "type": "boolean"
+              },
+              "breed": {
+                "type": "string",
+                "enum": ["Dingo", "Husky", "Retriever", "Shepherd"]
+              }
+            }
+          }
+        ]
+      },
+      "Cat": {
+        "type": "object",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/Pet"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "hunts": {
+                "type": "boolean"
+              },
+              "age": {
+                "type": "integer"
+              }
+            }
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/packages/api-explorer/__tests__/__fixtures__/polymorphism/oneof-nested-ref.json b/packages/api-explorer/__tests__/__fixtures__/polymorphism/oneof-nested-ref.json
new file mode 100644
index 000000000..e35d53578
--- /dev/null
+++ b/packages/api-explorer/__tests__/__fixtures__/polymorphism/oneof-nested-ref.json
@@ -0,0 +1,52 @@
+{
+  "openapi": "3.0.0",
+  "servers": [
+    {
+      "url": "http://httpbin.org"
+    }
+  ],
+  "paths": {
+    "/post": {
+      "post": {
+        "requestBody": {
+          "$ref": "#/components/requestBodies/body"
+        }
+      }
+    }
+  },
+  "components": {
+    "requestBodies": {
+      "body": {
+        "required": true,
+        "content": {
+          "application/json": {
+            "schema": {
+              "type": "object",
+              "properties": {
+                "config": {
+                  "oneOf": [
+                    {
+                      "$ref": "#/components/schemas/schema1"
+                    },
+                    {
+                      "$ref": "#/components/schemas/schema2"
+                    }
+                  ]
+                }
+              },
+              "additionalProperties": false
+            }
+          }
+        }
+      }
+    },
+    "schemas": {
+      "schema1": {
+        "type": "string"
+      },
+      "schema2": {
+        "type": "string"
+      }
+    }
+  }
+}
diff --git a/packages/api-explorer/__tests__/fixtures/string/oas.json b/packages/api-explorer/__tests__/__fixtures__/string/oas.json
similarity index 81%
rename from packages/api-explorer/__tests__/fixtures/string/oas.json
rename to packages/api-explorer/__tests__/__fixtures__/string/oas.json
index 81ff78803..bc549ab7f 100644
--- a/packages/api-explorer/__tests__/fixtures/string/oas.json
+++ b/packages/api-explorer/__tests__/__fixtures__/string/oas.json
@@ -9,6 +9,25 @@
     "version": "1.0.0"
   },
   "paths": {
+    "/format-blob": {
+      "get": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "string blob": {
+                    "type": "string",
+                    "format": "blob"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/format-date": {
       "get": {
         "requestBody": {
@@ -66,6 +85,25 @@
         }
       }
     },
+    "/format-html": {
+      "get": {
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "string html": {
+                    "type": "string",
+                    "format": "html"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/format-password": {
       "get": {
         "requestBody": {
diff --git a/packages/api-explorer/__tests__/fixtures/petstore/circular-oas.json b/packages/api-explorer/__tests__/fixtures/petstore/circular-oas.json
deleted file mode 100644
index 2335bb01c..000000000
--- a/packages/api-explorer/__tests__/fixtures/petstore/circular-oas.json
+++ /dev/null
@@ -1,1023 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "servers": [
-    {
-      "url": "http://petstore.swagger.io/v2"
-    }
-  ],
-  "info": {
-    "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
-    "version": "1.0.0",
-    "title": "Swagger Petstore",
-    "termsOfService": "http://swagger.io/terms/",
-    "contact": {
-      "email": "apiteam@swagger.io"
-    },
-    "license": {
-      "name": "Apache 2.0",
-      "url": "http://www.apache.org/licenses/LICENSE-2.0.html"
-    }
-  },
-  "tags": [
-    {
-      "name": "pet",
-      "description": "Everything about your Pets",
-      "externalDocs": {
-        "description": "Find out more",
-        "url": "http://swagger.io"
-      }
-    },
-    {
-      "name": "store",
-      "description": "Access to Petstore orders"
-    },
-    {
-      "name": "user",
-      "description": "Operations about user",
-      "externalDocs": {
-        "description": "Find out more about our store",
-        "url": "http://swagger.io"
-      }
-    }
-  ],
-  "paths": {
-    "/pet": {
-      "post": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Add a new pet to the store",
-        "description": "",
-        "operationId": "addPet",
-        "parameters": [],
-        "responses": {
-          "405": {
-            "description": "Invalid input"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "required": [
-                  "name",
-                  "photoUrls"
-                ],
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "format": "int64"
-                  },
-                  "category": {
-                    "type": "object",
-                    "properties": {
-                      "id": {
-                        "type": "integer",
-                        "format": "int64"
-                      },
-                      "name": {
-                        "type": "string"
-                      }
-                    },
-                    "xml": {
-                      "name": "Category"
-                    }
-                  },
-                  "name": {
-                    "type": "string",
-                    "example": "doggie"
-                  },
-                  "photoUrls": {
-                    "type": "array",
-                    "xml": {
-                      "name": "photoUrl",
-                      "wrapped": true
-                    },
-                    "items": {
-                      "type": "string"
-                    }
-                  },
-                  "tags": {
-                    "type": "array",
-                    "xml": {
-                      "name": "tag",
-                      "wrapped": true
-                    },
-                    "items": {
-                      "type": "object",
-                      "properties": {
-                        "id": {
-                          "type": "integer",
-                          "format": "int64"
-                        },
-                        "name": {
-                          "type": "string"
-                        }
-                      },
-                      "xml": {
-                        "name": "Tag"
-                      }
-                    }
-                  },
-                  "status": {
-                    "type": "string",
-                    "description": "pet status in the store",
-                    "enum": [
-                      "available",
-                      "pending",
-                      "sold"
-                    ]
-                  }
-                },
-                "xml": {
-                  "name": "Pet"
-                }
-              }
-            },
-            "application/xml": {
-              "schema": "~paths~/pet~post~requestBody~content~application/json~schema"
-            }
-          },
-          "description": "Pet object that needs to be added to the store",
-          "required": true
-        }
-      },
-      "put": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Update an existing pet",
-        "description": "",
-        "operationId": "updatePet",
-        "parameters": [],
-        "responses": {
-          "400": {
-            "description": "Invalid ID supplied"
-          },
-          "404": {
-            "description": "Pet not found"
-          },
-          "405": {
-            "description": "Validation exception"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ],
-        "requestBody": "~paths~/pet~post~requestBody"
-      }
-    },
-    "/pet/findByStatus": {
-      "get": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Finds Pets by status",
-        "description": "Multiple status values can be provided with comma separated strings",
-        "operationId": "findPetsByStatus",
-        "parameters": [
-          {
-            "name": "status",
-            "in": "query",
-            "description": "Status values that need to be considered for filter",
-            "required": true,
-            "explode": true,
-            "schema": {
-              "type": "array",
-              "items": {
-                "type": "string",
-                "enum": [
-                  "available",
-                  "pending",
-                  "sold"
-                ],
-                "default": "available"
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/xml": {
-                "schema": {
-                  "type": "array",
-                  "items": "~paths~/pet~post~requestBody~content~application/json~schema"
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": "~paths~/pet~post~requestBody~content~application/json~schema"
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid status value"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ]
-      }
-    },
-    "/pet/findByTags": {
-      "get": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Finds Pets by tags",
-        "description": "Muliple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.",
-        "operationId": "findPetsByTags",
-        "parameters": [
-          {
-            "name": "tags",
-            "in": "query",
-            "description": "Tags to filter by",
-            "required": true,
-            "explode": true,
-            "schema": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/xml": {
-                "schema": {
-                  "type": "array",
-                  "items": "~paths~/pet~post~requestBody~content~application/json~schema"
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": "~paths~/pet~post~requestBody~content~application/json~schema"
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid tag value"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ],
-        "deprecated": true
-      }
-    },
-    "/pet/{petId}": {
-      "get": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Find pet by ID",
-        "description": "Returns a single pet",
-        "operationId": "getPetById",
-        "parameters": [
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "ID of pet to return",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/xml": {
-                "schema": "~paths~/pet~post~requestBody~content~application/json~schema"
-              },
-              "application/json": {
-                "schema": "~paths~/pet~post~requestBody~content~application/json~schema"
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid ID supplied"
-          },
-          "404": {
-            "description": "Pet not found"
-          }
-        },
-        "security": [
-          {
-            "api_key": []
-          }
-        ]
-      },
-      "post": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Updates a pet in the store with form data",
-        "description": "",
-        "operationId": "updatePetWithForm",
-        "parameters": [
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "ID of pet that needs to be updated",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
-        "responses": {
-          "405": {
-            "description": "Invalid input"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/x-www-form-urlencoded": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "name": {
-                    "description": "Updated name of the pet",
-                    "type": "string"
-                  },
-                  "status": {
-                    "description": "Updated status of the pet",
-                    "type": "string"
-                  }
-                }
-              }
-            }
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "Deletes a pet",
-        "description": "",
-        "operationId": "deletePet",
-        "parameters": [
-          {
-            "name": "api_key",
-            "in": "header",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "Pet id to delete",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
-        "responses": {
-          "400": {
-            "description": "Invalid ID supplied"
-          },
-          "404": {
-            "description": "Pet not found"
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ]
-      }
-    },
-    "/pet/{petId}/uploadImage": {
-      "post": {
-        "tags": [
-          "pet"
-        ],
-        "summary": "uploads an image",
-        "description": "",
-        "operationId": "uploadFile",
-        "parameters": [
-          {
-            "name": "petId",
-            "in": "path",
-            "description": "ID of pet to update",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "code": {
-                      "type": "integer",
-                      "format": "int32"
-                    },
-                    "type": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "petstore_auth": [
-              "write:pets",
-              "read:pets"
-            ]
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/octet-stream": {
-              "schema": {
-                "type": "string",
-                "format": "binary"
-              }
-            }
-          }
-        }
-      }
-    },
-    "/store/inventory": {
-      "get": {
-        "tags": [
-          "store"
-        ],
-        "summary": "Returns pet inventories by status",
-        "description": "Returns a map of status codes to quantities",
-        "operationId": "getInventory",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "additionalProperties": {
-                    "type": "integer",
-                    "format": "int32"
-                  }
-                }
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "api_key": []
-          }
-        ]
-      }
-    },
-    "/store/order": {
-      "post": {
-        "tags": [
-          "store"
-        ],
-        "summary": "Place an order for a pet",
-        "description": "",
-        "operationId": "placeOrder",
-        "parameters": [],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/xml": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "id": {
-                      "type": "integer",
-                      "format": "int64"
-                    },
-                    "petId": {
-                      "type": "integer",
-                      "format": "int64"
-                    },
-                    "quantity": {
-                      "type": "integer",
-                      "format": "int32"
-                    },
-                    "shipDate": {
-                      "type": "string",
-                      "format": "date-time"
-                    },
-                    "status": {
-                      "type": "string",
-                      "description": "Order Status",
-                      "enum": [
-                        "placed",
-                        "approved",
-                        "delivered"
-                      ]
-                    },
-                    "complete": {
-                      "type": "boolean",
-                      "default": false
-                    }
-                  },
-                  "xml": {
-                    "name": "Order"
-                  }
-                }
-              },
-              "application/json": {
-                "schema": "~paths~/store/order~post~responses~200~content~application/xml~schema"
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid Order"
-          }
-        },
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": "~paths~/store/order~post~responses~200~content~application/xml~schema"
-            }
-          },
-          "description": "order placed for purchasing the pet",
-          "required": true
-        }
-      }
-    },
-    "/store/order/{orderId}": {
-      "get": {
-        "tags": [
-          "store"
-        ],
-        "summary": "Find purchase order by ID",
-        "description": "For valid response try integer IDs with value >= 1 and <= 10. Other values will generated exceptions",
-        "operationId": "getOrderById",
-        "parameters": [
-          {
-            "name": "orderId",
-            "in": "path",
-            "description": "ID of pet that needs to be fetched",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64",
-              "minimum": 1,
-              "maximum": 10
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/xml": {
-                "schema": "~paths~/store/order~post~responses~200~content~application/xml~schema"
-              },
-              "application/json": {
-                "schema": "~paths~/store/order~post~responses~200~content~application/xml~schema"
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid ID supplied"
-          },
-          "404": {
-            "description": "Order not found"
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "store"
-        ],
-        "summary": "Delete purchase order by ID",
-        "description": "For valid response try integer IDs with positive integer value. Negative or non-integer values will generate API errors",
-        "operationId": "deleteOrder",
-        "parameters": [
-          {
-            "name": "orderId",
-            "in": "path",
-            "description": "ID of the order that needs to be deleted",
-            "required": true,
-            "schema": {
-              "type": "integer",
-              "format": "int64",
-              "minimum": 1
-            }
-          }
-        ],
-        "responses": {
-          "400": {
-            "description": "Invalid ID supplied"
-          },
-          "404": {
-            "description": "Order not found"
-          }
-        }
-      }
-    },
-    "/user": {
-      "post": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Create user",
-        "description": "This can only be done by the logged in user.",
-        "operationId": "createUser",
-        "parameters": [],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        },
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "object",
-                "properties": {
-                  "id": {
-                    "type": "integer",
-                    "format": "int64"
-                  },
-                  "username": {
-                    "type": "string"
-                  },
-                  "firstName": {
-                    "type": "string"
-                  },
-                  "lastName": {
-                    "type": "string"
-                  },
-                  "email": {
-                    "type": "string"
-                  },
-                  "password": {
-                    "type": "string"
-                  },
-                  "phone": {
-                    "type": "string"
-                  },
-                  "userStatus": {
-                    "type": "integer",
-                    "format": "int32",
-                    "description": "User Status"
-                  }
-                },
-                "xml": {
-                  "name": "User"
-                }
-              }
-            }
-          },
-          "description": "Created user object",
-          "required": true
-        }
-      }
-    },
-    "/user/createWithArray": {
-      "post": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Creates list of users with given input array",
-        "description": "",
-        "operationId": "createUsersWithArrayInput",
-        "parameters": [],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        },
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "type": "array",
-                "items": "~paths~/user~post~requestBody~content~application/json~schema"
-              }
-            }
-          },
-          "description": "List of user object",
-          "required": true
-        }
-      }
-    },
-    "/user/createWithList": {
-      "post": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Creates list of users with given input array",
-        "description": "",
-        "operationId": "createUsersWithListInput",
-        "parameters": [],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        },
-        "requestBody": "~paths~/user/createWithArray~post~requestBody"
-      }
-    },
-    "/user/login": {
-      "get": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Logs user into the system",
-        "description": "",
-        "operationId": "loginUser",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "query",
-            "description": "The user name for login",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "password",
-            "in": "query",
-            "description": "The password for login in clear text",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "headers": {
-              "X-Rate-Limit": {
-                "description": "calls per hour allowed by the user",
-                "schema": {
-                  "type": "integer",
-                  "format": "int32"
-                }
-              },
-              "X-Expires-After": {
-                "description": "date in UTC when token expires",
-                "schema": {
-                  "type": "string",
-                  "format": "date-time"
-                }
-              }
-            },
-            "content": {
-              "application/xml": {
-                "schema": {
-                  "type": "string"
-                }
-              },
-              "application/json": {
-                "schema": {
-                  "type": "string"
-                }
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid username/password supplied"
-          }
-        }
-      }
-    },
-    "/user/logout": {
-      "get": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Logs out current logged in user session",
-        "description": "",
-        "operationId": "logoutUser",
-        "parameters": [],
-        "responses": {
-          "default": {
-            "description": "successful operation"
-          }
-        }
-      }
-    },
-    "/user/{username}": {
-      "get": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Get user by user name",
-        "description": "",
-        "operationId": "getUserByName",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "description": "The name that needs to be fetched. Use user1 for testing. ",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "successful operation",
-            "content": {
-              "application/xml": {
-                "schema": "~paths~/user~post~requestBody~content~application/json~schema"
-              },
-              "application/json": {
-                "schema": "~paths~/user~post~requestBody~content~application/json~schema"
-              }
-            }
-          },
-          "400": {
-            "description": "Invalid username supplied"
-          },
-          "404": {
-            "description": "User not found"
-          }
-        }
-      },
-      "put": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Updated user",
-        "description": "This can only be done by the logged in user.",
-        "operationId": "updateUser",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "description": "name that need to be updated",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "400": {
-            "description": "Invalid user supplied"
-          },
-          "404": {
-            "description": "User not found"
-          }
-        },
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": "~paths~/user~post~requestBody~content~application/json~schema"
-            }
-          },
-          "description": "Updated user object",
-          "required": true
-        }
-      },
-      "delete": {
-        "tags": [
-          "user"
-        ],
-        "summary": "Delete user",
-        "description": "This can only be done by the logged in user.",
-        "operationId": "deleteUser",
-        "parameters": [
-          {
-            "name": "username",
-            "in": "path",
-            "description": "The name that needs to be deleted",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "400": {
-            "description": "Invalid username supplied"
-          },
-          "404": {
-            "description": "User not found"
-          }
-        }
-      }
-    }
-  },
-  "externalDocs": {
-    "description": "Find out more about Swagger",
-    "url": "http://swagger.io"
-  },
-  "x-explorer-enabled": true,
-  "x-samples-enabled": true,
-  "x-samples-languages": [
-    "curl",
-    "node",
-    "ruby",
-    "javascript",
-    "python"
-  ],
-  "components": {
-    "schemas": {
-      "Order": "~paths~/store/order~post~responses~200~content~application/xml~schema",
-      "Category": "~paths~/pet~post~requestBody~content~application/json~schema~properties~category",
-      "User": "~paths~/user~post~requestBody~content~application/json~schema",
-      "Tag": "~paths~/pet~post~requestBody~content~application/json~schema~properties~tags~items",
-      "Pet": "~paths~/pet~post~requestBody~content~application/json~schema",
-      "ApiResponse": "~paths~/pet/{petId}/uploadImage~post~responses~200~content~application/json~schema"
-    },
-    "responses": {},
-    "parameters": {},
-    "examples": {},
-    "requestBodies": {
-      "Pet": "~paths~/pet~post~requestBody",
-      "UserArray": "~paths~/user/createWithArray~post~requestBody"
-    },
-    "securitySchemes": {
-      "petstore_auth": {
-        "type": "oauth2",
-        "flows": {
-          "implicit": {
-            "authorizationUrl": "http://petstore.swagger.io/oauth/dialog",
-            "scopes": {
-              "write:pets": "modify pets in your account",
-              "read:pets": "read your pets"
-            }
-          }
-        }
-      },
-      "api_key": {
-        "type": "apiKey",
-        "name": "api_key",
-        "in": "header"
-      }
-    },
-    "headers": {}
-  }
-}
diff --git a/packages/api-explorer/__tests__/index.test.jsx b/packages/api-explorer/__tests__/index.test.jsx
index a8c9a3fb0..108e5e5c2 100644
--- a/packages/api-explorer/__tests__/index.test.jsx
+++ b/packages/api-explorer/__tests__/index.test.jsx
@@ -2,12 +2,14 @@ const React = require('react');
 const { shallow, mount } = require('enzyme');
 const Cookie = require('js-cookie');
 const extensions = require('@readme/oas-extensions');
+const shortid = require('shortid');
 const WrappedApiExplorer = require('../src');
+const ErrorBoundary = require('../src/ErrorBoundary');
 
 const { ApiExplorer } = WrappedApiExplorer;
 
-const oas = require('./fixtures/petstore/oas');
-const oasCommon = require('./fixtures/parameters/common');
+const oas = require('./__fixtures__/petstore/oas');
+const oasCommon = require('./__fixtures__/parameters/common');
 
 const createDocs = require('../lib/create-docs');
 
@@ -48,12 +50,42 @@ test('ApiExplorer should not render a common parameter OAS operation method', ()
   expect(explorer.find('Doc')).toHaveLength(docsCommon.length - 2);
 });
 
-test('should display an error message if it fails to render (wrapped in ErrorBoundary)', () => {
-  // Prompting an error with an array of nulls instead of Docs
-  // This is to simulate some unknown error state during initial render
-  const explorer = mount(<WrappedApiExplorer {...props} docs={[null, null]} />);
+describe('error handling', () => {
+  const spy = jest.spyOn(shortid, 'generate');
+  const originalConsole = console;
 
-  expect(explorer.find('ErrorBoundary')).toHaveLength(1);
+  // We're testing errors here, so we don't need `console.error` logs spamming the test output.
+  beforeEach(() => {
+    // eslint-disable-next-line no-console
+    console.error = () => {};
+  });
+
+  afterEach(() => {
+    // eslint-disable-next-line no-console
+    console.error = originalConsole.error;
+  });
+
+  it('should display a masked error message if it fails to render', () => {
+    const explorer = mount(<WrappedApiExplorer {...props} docs={[null, null]} maskErrorMessages={true} />);
+
+    const html = explorer.html();
+
+    expect(spy).toHaveBeenCalled();
+    expect(explorer.find(ErrorBoundary)).toHaveLength(1);
+    expect(html).not.toMatch('support@readme.io');
+    expect(html).toMatch('API Explorer');
+  });
+
+  it('should output a support-focused error message if it fails to render', () => {
+    const explorer = mount(<WrappedApiExplorer {...props} docs={[null, null]} maskErrorMessages={false} />);
+
+    const html = explorer.html();
+
+    expect(spy).toHaveBeenCalled();
+    expect(explorer.find(ErrorBoundary)).toHaveLength(1);
+    expect(html).toMatch('support@readme.io');
+    expect(html).toMatch('API Explorer');
+  });
 });
 
 describe('selected language', () => {
@@ -188,10 +220,12 @@ describe('oas', () => {
 });
 
 describe('auth', () => {
+  const defaults = [];
+
   it('should read apiKey from `variables.user.apiKey`', () => {
     const apiKey = '123456';
 
-    const explorer = shallow(<ApiExplorer {...props} variables={{ user: { apiKey } }} />);
+    const explorer = shallow(<ApiExplorer {...props} variables={{ user: { apiKey }, defaults }} />);
 
     expect(explorer.state('auth')).toStrictEqual({ api_key: '123456', petstore_auth: '123456' });
   });
@@ -199,7 +233,9 @@ describe('auth', () => {
   it('should read apiKey from `variables.user.keys[].apiKey`', () => {
     const apiKey = '123456';
 
-    const explorer = shallow(<ApiExplorer {...props} variables={{ user: { keys: [{ name: 'a', apiKey }] } }} />);
+    const explorer = shallow(
+      <ApiExplorer {...props} variables={{ user: { keys: [{ name: 'a', apiKey }] }, defaults }} />
+    );
 
     expect(explorer.state('auth')).toStrictEqual({ api_key: '123456', petstore_auth: '123456' });
   });
@@ -208,7 +244,7 @@ describe('auth', () => {
     const apiKey = '123456';
 
     const explorer = shallow(
-      <ApiExplorer {...props} variables={{ user: { keys: [{ name: 'project1', api_key: apiKey }] } }} />
+      <ApiExplorer {...props} variables={{ user: { keys: [{ name: 'project1', api_key: apiKey }] }, defaults }} />
     );
 
     expect(explorer.state('auth')).toStrictEqual({ api_key: '123456', petstore_auth: '' });
diff --git a/packages/api-explorer/__tests__/lib/create-code-shower.test.js b/packages/api-explorer/__tests__/lib/create-code-shower.test.js
index c8e2cff1d..a488a723e 100644
--- a/packages/api-explorer/__tests__/lib/create-code-shower.test.js
+++ b/packages/api-explorer/__tests__/lib/create-code-shower.test.js
@@ -3,8 +3,8 @@ const Oas = require('@readme/oas-tooling');
 const createCodeShower = require('../../src/lib/create-code-shower')('results');
 const createCodeShower2 = require('../../src/lib/create-code-shower')('examples');
 
-const example = require('../fixtures/example-results/oas');
-const petstore = require('../fixtures/petstore/oas');
+const example = require('../__fixtures__/example-results/oas');
+const petstore = require('../__fixtures__/petstore/oas');
 
 const oas = new Oas(example);
 const oas2 = new Oas(petstore);
diff --git a/packages/api-explorer/__tests__/lib/get-auth.test.js b/packages/api-explorer/__tests__/lib/get-auth.test.js
index 3d956bf14..921b64246 100644
--- a/packages/api-explorer/__tests__/lib/get-auth.test.js
+++ b/packages/api-explorer/__tests__/lib/get-auth.test.js
@@ -1,6 +1,6 @@
 const Oas = require('@readme/oas-tooling');
 
-const multipleSecurities = require('../fixtures/multiple-securities/oas.json');
+const multipleSecurities = require('../__fixtures__/multiple-securities/oas.json');
 const getAuth = require('../../src/lib/get-auth');
 
 const oas = new Oas(multipleSecurities);
diff --git a/packages/api-explorer/__tests__/lib/is-auth-ready.test.js b/packages/api-explorer/__tests__/lib/is-auth-ready.test.js
index 2733f509d..4d9b75f9f 100644
--- a/packages/api-explorer/__tests__/lib/is-auth-ready.test.js
+++ b/packages/api-explorer/__tests__/lib/is-auth-ready.test.js
@@ -1,8 +1,8 @@
 const Oas = require('@readme/oas-tooling');
 
 const isAuthReady = require('../../src/lib/is-auth-ready');
-const authTypesOas = require('../fixtures/auth-types/oas');
-const multipleSchemes = require('../fixtures/multiple-securities/oas');
+const authTypesOas = require('../__fixtures__/auth-types/oas');
+const multipleSchemes = require('../__fixtures__/multiple-securities/oas');
 
 const oas = new Oas(authTypesOas);
 const oas2 = new Oas(multipleSchemes);
diff --git a/packages/api-explorer/package-lock.json b/packages/api-explorer/package-lock.json
index 83a1cd58e..bb7fe45de 100644
--- a/packages/api-explorer/package-lock.json
+++ b/packages/api-explorer/package-lock.json
@@ -260,9 +260,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.3.tgz",
+      "integrity": "sha512-fVHx1rzEmwB130VTkLnxR+HmxcTjGzH12LYQcFFoBwakMd3aOMD4OsRN7tGG/UOYE2ektgFrS8uACAoRk1CY0w==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.2"
@@ -276,6 +276,22 @@
         }
       }
     },
+    "@babel/runtime-corejs2": {
+      "version": "7.8.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.8.7.tgz",
+      "integrity": "sha512-R8zbPiv25S0pGfMqAr55dRRxWB8vUeo3wicI4g9PFVBKmsy/9wmQUV1AaYW/kxRHUhx42TTh6F0+QO+4pwfYWg==",
+      "requires": {
+        "core-js": "^2.6.5",
+        "regenerator-runtime": "^0.13.4"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+        }
+      }
+    },
     "@babel/template": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz",
@@ -649,6 +665,18 @@
         "strip-ansi": "^6.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -797,6 +825,70 @@
         "@jest/fake-timers": "^25.1.0",
         "@jest/types": "^25.1.0",
         "jest-mock": "^25.1.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "@jest/fake-timers": {
@@ -810,6 +902,70 @@
         "jest-mock": "^25.1.0",
         "jest-util": "^25.1.0",
         "lolex": "^5.0.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "@jest/reporters": {
@@ -846,6 +1002,18 @@
         "v8-to-istanbul": "^4.0.1"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -950,6 +1118,70 @@
         "@jest/types": "^25.1.0",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "@jest/test-sequencer": {
@@ -988,6 +1220,18 @@
         "write-file-atomic": "^3.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -1095,70 +1339,6 @@
         }
       }
     },
-    "@jest/types": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
-      "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
-      "dev": true,
-      "requires": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^1.1.1",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.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"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "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
-        },
-        "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
-        },
-        "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"
-          }
-        }
-      }
-    },
     "@readme/eslint-config": {
       "version": "1.14.0",
       "resolved": "https://registry.npmjs.org/@readme/eslint-config/-/eslint-config-1.14.0.tgz",
@@ -1179,14 +1359,50 @@
         "eslint-plugin-unicorn": "^16.0.0"
       }
     },
-    "@readme/oas-tooling": {
+    "@readme/oas-examples": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@readme/oas-tooling/-/oas-tooling-2.1.1.tgz",
-      "integrity": "sha512-gIzonSW5P7mSYn0IFLlbMxqWSa/geDce5Vsz5O7XT231K2aQWnmOW8H1cadYQAzdBJJbjzZTNJSrKr5QJDl7yQ==",
+      "resolved": "https://registry.npmjs.org/@readme/oas-examples/-/oas-examples-2.1.1.tgz",
+      "integrity": "sha512-MdEOEvYAWnrKv7aeJPHjnbsevfq+fm6/0AswRznpxeqasV7vDmi/AVbmKZVnPI19zwkC5QOJiI2y6c0rx4XZuw==",
+      "dev": true
+    },
+    "@readme/oas-tooling": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@readme/oas-tooling/-/oas-tooling-3.0.0.tgz",
+      "integrity": "sha512-4wpLB+ow2lwzMLpeAbfagap+sKnpP558Dr0NV1FL+g+ATngGSUBGq3n8laSHBW3nZ6OIrHchXGh1bfxqVE+9aA==",
       "requires": {
+        "jsonpointer": "^4.0.1",
         "path-to-regexp": "^6.1.0"
       }
     },
+    "@readme/react-jsonschema-form": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@readme/react-jsonschema-form/-/react-jsonschema-form-1.1.1.tgz",
+      "integrity": "sha512-V0G7usTxh+J0IJ81kma5+6T8GoaD8DqONJ90cCvLisdNXif+Mp2ikqBchDQ4voMk6IRRKs56NYtJV0B6AtxaWA==",
+      "requires": {
+        "@babel/runtime-corejs2": "^7.4.5",
+        "ajv": "^6.7.0",
+        "core-js": "^2.5.7",
+        "json-schema-merge-allof": "^0.6.0",
+        "jsonpointer": "^4.0.1",
+        "lodash": "^4.17.15",
+        "prop-types": "^15.7.2",
+        "react-app-polyfill": "^1.0.4",
+        "react-is": "^16.9.0",
+        "shortid": "^2.2.14"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+        },
+        "react-is": {
+          "version": "16.13.0",
+          "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz",
+          "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA=="
+        }
+      }
+    },
     "@sinonjs/commons": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz",
@@ -1905,6 +2121,18 @@
         "slash": "^3.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -1987,23 +2215,7 @@
       "requires": {
         "@babel/plugin-syntax-bigint": "^7.0.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "babel-plugin-jest-hoist": "^25.1.0"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-        }
+        "babel-plugin-jest-hoist": "^25.1.0"
       }
     },
     "babylon": {
@@ -2681,6 +2893,27 @@
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
       "dev": true
     },
+    "compute-gcd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/compute-gcd/-/compute-gcd-1.2.0.tgz",
+      "integrity": "sha1-/B7eW2UAHpUCJlAvRlQ4Y+T+oQ4=",
+      "requires": {
+        "validate.io-array": "^1.0.3",
+        "validate.io-function": "^1.0.2",
+        "validate.io-integer-array": "^1.0.0"
+      }
+    },
+    "compute-lcm": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/compute-lcm/-/compute-lcm-1.1.0.tgz",
+      "integrity": "sha1-q9ltBAtBsKFm+JlEtci3xRHiGtU=",
+      "requires": {
+        "compute-gcd": "^1.2.0",
+        "validate.io-array": "^1.0.3",
+        "validate.io-function": "^1.0.2",
+        "validate.io-integer-array": "^1.0.0"
+      }
+    },
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -4000,6 +4233,18 @@
         "jest-regex-util": "^25.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4010,6 +4255,16 @@
             "color-convert": "^2.0.1"
           }
         },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4024,6 +4279,21 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
+        },
+        "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
+        },
+        "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"
+          }
         }
       }
     },
@@ -6098,6 +6368,18 @@
         "jest-cli": "^25.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -6259,6 +6541,53 @@
         "throat": "^5.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
         "cross-spawn": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
@@ -6297,6 +6626,12 @@
             "pump": "^3.0.0"
           }
         },
+        "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
+        },
         "is-stream": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -6339,6 +6674,15 @@
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "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"
+          }
+        },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -6375,6 +6719,18 @@
         "realpath-native": "^1.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -6556,6 +6912,18 @@
         "pretty-format": "^25.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -6620,6 +6988,70 @@
         "jest-mock": "^25.1.0",
         "jest-util": "^25.1.0",
         "jsdom": "^15.1.1"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "jest-environment-node": {
@@ -6633,6 +7065,70 @@
         "@jest/types": "^25.1.0",
         "jest-mock": "^25.1.0",
         "jest-util": "^25.1.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "jest-get-type": {
@@ -6660,6 +7156,28 @@
         "walker": "^1.0.7"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
         "anymatch": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -6679,6 +7197,31 @@
             "fill-range": "^7.0.1"
           }
         },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
         "fill-range": {
           "version": "7.0.1",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -6784,6 +7327,18 @@
         "throat": "^5.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -6926,6 +7481,18 @@
         "stack-utils": "^1.0.1"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7028,6 +7595,70 @@
       "dev": true,
       "requires": {
         "@jest/types": "^25.1.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "jest-pnp-resolver": {
@@ -7055,6 +7686,18 @@
         "realpath-native": "^1.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7116,6 +7759,70 @@
         "@jest/types": "^25.1.0",
         "jest-regex-util": "^25.1.0",
         "jest-snapshot": "^25.1.0"
+      },
+      "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
+        "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"
+          }
+        },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "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
+        },
+        "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
+        },
+        "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"
+          }
+        }
       }
     },
     "jest-runner": {
@@ -7145,6 +7852,18 @@
         "throat": "^5.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7246,6 +7965,18 @@
         "yargs": "^15.0.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7351,6 +8082,18 @@
         "semver": "^7.1.1"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7421,6 +8164,18 @@
         "mkdirp": "^0.5.1"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7487,6 +8242,18 @@
         "pretty-format": "^25.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7559,6 +8326,18 @@
         "string-length": "^3.1.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-styles": {
           "version": "4.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -7776,6 +8555,24 @@
       "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
       "dev": true
     },
+    "json-schema-compare": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/json-schema-compare/-/json-schema-compare-0.2.2.tgz",
+      "integrity": "sha512-c4WYmDKyJXhs7WWvAWm3uIYnfyWFoIp+JEoX34rctVvEkMYCPGhXtvmFFXiffBbxfZsvQ0RNnV5H7GvDF5HCqQ==",
+      "requires": {
+        "lodash": "^4.17.4"
+      }
+    },
+    "json-schema-merge-allof": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/json-schema-merge-allof/-/json-schema-merge-allof-0.6.0.tgz",
+      "integrity": "sha512-LEw4VMQVRceOPLuGRWcxW5orTTiR9ZAtqTAe4rQUjNADTeR81bezBVFa0MqIwp0YmHIM1KkhSjZM7o+IQhaPbQ==",
+      "requires": {
+        "compute-lcm": "^1.1.0",
+        "json-schema-compare": "^0.2.2",
+        "lodash": "^4.17.4"
+      }
+    },
     "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",
@@ -7805,6 +8602,11 @@
         }
       }
     },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -7967,11 +8769,6 @@
       "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
       "dev": true
     },
-    "lodash.topath": {
-      "version": "4.5.2",
-      "resolved": "https://registry.npmjs.org/lodash.topath/-/lodash.topath-4.5.2.tgz",
-      "integrity": "sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak="
-    },
     "lodash.upperfirst": {
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz",
@@ -8337,6 +9134,11 @@
       "dev": true,
       "optional": true
     },
+    "nanoid": {
+      "version": "2.1.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz",
+      "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="
+    },
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -8993,8 +9795,7 @@
     "performance-now": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
       "version": "2.2.1",
@@ -9095,6 +9896,18 @@
         "react-is": "^16.12.0"
       },
       "dependencies": {
+        "@jest/types": {
+          "version": "25.1.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.1.0.tgz",
+          "integrity": "sha512-VpOtt7tCrgvamWZh1reVsGADujKigBUFTi19mlRjqEGsE8qH4r3s+skY33dNdXOwyZIvuftZ5tqdF1IgsMejMA==",
+          "dev": true,
+          "requires": {
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^1.1.1",
+            "@types/yargs": "^15.0.0",
+            "chalk": "^3.0.0"
+          }
+        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -9111,6 +9924,16 @@
             "color-convert": "^2.0.1"
           }
         },
+        "chalk": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
         "color-convert": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -9126,11 +9949,26 @@
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
+        "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
+        },
         "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
+        },
+        "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"
+          }
         }
       }
     },
@@ -9292,6 +10130,14 @@
       "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
       "dev": true
     },
+    "raf": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "requires": {
+        "performance-now": "^2.1.0"
+      }
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -9321,6 +10167,34 @@
         "prop-types": "^15.6.2"
       }
     },
+    "react-app-polyfill": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz",
+      "integrity": "sha512-OfBnObtnGgLGfweORmdZbyEz+3dgVePQBb3zipiaDsMHV1NpWm0rDFYIVXFV/AK+x4VIIfWHhrdMIeoTLyRr2g==",
+      "requires": {
+        "core-js": "^3.5.0",
+        "object-assign": "^4.1.1",
+        "promise": "^8.0.3",
+        "raf": "^3.4.1",
+        "regenerator-runtime": "^0.13.3",
+        "whatwg-fetch": "^3.0.0"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "3.6.4",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.4.tgz",
+          "integrity": "sha512-4paDGScNgZP2IXXilaffL9X7968RuvwlkK3xWtZRVqgd8SYNiVKRJvkFd1aqqEuPfN7E68ZHEp9hDj6lHj4Hyw=="
+        },
+        "promise": {
+          "version": "8.1.0",
+          "resolved": "https://registry.npmjs.org/promise/-/promise-8.1.0.tgz",
+          "integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
+          "requires": {
+            "asap": "~2.0.6"
+          }
+        }
+      }
+    },
     "react-base16-styling": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz",
@@ -9366,24 +10240,6 @@
         "react-textarea-autosize": "^6.1.0"
       }
     },
-    "react-jsonschema-form": {
-      "version": "github:readmeio/react-jsonschema-form#3a3a478b4d726bfb2893ef019e8b8143006d0339",
-      "from": "github:readmeio/react-jsonschema-form#dist-committed",
-      "requires": {
-        "ajv": "^6.7.0",
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.7",
-        "lodash.topath": "^4.5.2",
-        "prop-types": "^15.5.8"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.11",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
-        }
-      }
-    },
     "react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
@@ -9485,9 +10341,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz",
+      "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g=="
     },
     "regex-not": {
       "version": "1.0.2",
@@ -9942,6 +10798,14 @@
       "dev": true,
       "optional": true
     },
+    "shortid": {
+      "version": "2.2.15",
+      "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.15.tgz",
+      "integrity": "sha512-5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==",
+      "requires": {
+        "nanoid": "^2.1.0"
+      }
+    },
     "side-channel": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz",
@@ -11172,6 +12036,38 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
+    "validate.io-array": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/validate.io-array/-/validate.io-array-1.0.6.tgz",
+      "integrity": "sha1-W1osr9j4uFq7L4hroVPy2Tond00="
+    },
+    "validate.io-function": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/validate.io-function/-/validate.io-function-1.0.2.tgz",
+      "integrity": "sha1-NDoZgC7TsZaCaceA5VjpNBHAutc="
+    },
+    "validate.io-integer": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/validate.io-integer/-/validate.io-integer-1.0.5.tgz",
+      "integrity": "sha1-FoSWSAuVviJH7EQ/IjPeT4mHgGg=",
+      "requires": {
+        "validate.io-number": "^1.0.3"
+      }
+    },
+    "validate.io-integer-array": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/validate.io-integer-array/-/validate.io-integer-array-1.0.0.tgz",
+      "integrity": "sha1-LKveAzKTpry+Bj/q/pHq9GsToIk=",
+      "requires": {
+        "validate.io-array": "^1.0.3",
+        "validate.io-integer": "^1.0.4"
+      }
+    },
+    "validate.io-number": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/validate.io-number/-/validate.io-number-1.0.3.tgz",
+      "integrity": "sha1-9j/+2iSL8opnqNSODjtGGhZluvg="
+    },
     "verror": {
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
diff --git a/packages/api-explorer/package.json b/packages/api-explorer/package.json
index cda1ffbed..96e0ff4bb 100644
--- a/packages/api-explorer/package.json
+++ b/packages/api-explorer/package.json
@@ -8,7 +8,8 @@
     "@readme/markdown-magic": "^5.0.0",
     "@readme/oas-extensions": "^5.0.0",
     "@readme/oas-to-har": "^5.0.0",
-    "@readme/oas-tooling": "^2.1.1",
+    "@readme/oas-tooling": "^3.0.0",
+    "@readme/react-jsonschema-form": "^1.1.1",
     "@readme/syntax-highlighter": "^5.0.0",
     "@readme/variable": "^5.0.0",
     "classnames": "^2.2.5",
@@ -21,8 +22,8 @@
     "react-copy-to-clipboard": "^5.0.1",
     "react-debounce-input": "^3.2.0",
     "react-json-view": "^1.19.1",
-    "react-jsonschema-form": "github:readmeio/react-jsonschema-form#dist-committed",
     "react-waypoint": "^7.3.1",
+    "shortid": "^2.2.15",
     "whatwg-fetch": "^3.0.0"
   },
   "scripts": {
@@ -43,6 +44,7 @@
   "repository": "https://github.com/readmeio/api-explorer/tree/master/packages/api-explorer",
   "devDependencies": {
     "@readme/eslint-config": "^1.7.0",
+    "@readme/oas-examples": "^2.1.1",
     "eslint": "^6.5.0",
     "jest": "^25.1.0",
     "jsinspect": "^0.12.6",
diff --git a/packages/api-explorer/src/AuthBox/index.jsx b/packages/api-explorer/src/AuthBox/index.jsx
index 813f98deb..07e7c3ae4 100644
--- a/packages/api-explorer/src/AuthBox/index.jsx
+++ b/packages/api-explorer/src/AuthBox/index.jsx
@@ -7,9 +7,9 @@ const { Operation } = require('@readme/oas-tooling');
 
 const SecurityInput = require('../SecurityInput');
 
-function GroupsList({ group, groups, onGroupChange }) {
+function GroupsList({ group, groups, onAuthGroupChange }) {
   function onSelect({ target }) {
-    onGroupChange(target.value);
+    onAuthGroupChange(target.value);
   }
 
   if (!groups || (groups && groups.length <= 1)) {
@@ -27,13 +27,13 @@ function GroupsList({ group, groups, onGroupChange }) {
   );
 }
 
-function Securities({ auth, authInputRef, group, groups, oauth, onChange, onGroupChange, onSubmit, operation }) {
+function Securities({ auth, authInputRef, group, groups, oauth, onChange, onAuthGroupChange, onSubmit, operation }) {
   const securityTypes = operation.prepareSecurity();
   return (
     <div className="AuthBox">
       {groups && groups.length > 1 && (
         <div className="GroupsList">
-          <GroupsList group={group} groups={groups} onGroupChange={onGroupChange} />
+          <GroupsList group={group} groups={groups} onAuthGroupChange={onAuthGroupChange} />
         </div>
       )}
       {Object.keys(securityTypes).map(type => {
@@ -84,7 +84,7 @@ function AuthBox({
   needsAuth,
   oauth,
   onChange,
-  onGroupChange,
+  onAuthGroupChange,
   onSubmit,
   open,
   operation,
@@ -106,8 +106,8 @@ function AuthBox({
             group={group}
             groups={groups}
             oauth={oauth}
+            onAuthGroupChange={onAuthGroupChange}
             onChange={onChange}
-            onGroupChange={onGroupChange}
             onSubmit={e => {
               e.preventDefault();
               onSubmit();
@@ -134,7 +134,7 @@ const commonProps = {
       name: PropTypes.string,
     })
   ),
-  onGroupChange: PropTypes.func.isRequired,
+  onAuthGroupChange: PropTypes.func.isRequired,
 };
 
 GroupsList.propTypes = {
@@ -164,4 +164,7 @@ AuthBox.defaultProps = {
 Securities.propTypes = { ...AuthBox.propTypes };
 Securities.defaultProps = { ...AuthBox.defaultProps };
 
+// `props.toggle` is not used in Securities, and passing it through as a required prop throws errors in dev.
+delete Securities.propTypes.toggle;
+
 module.exports = AuthBox;
diff --git a/packages/api-explorer/src/BoundaryStackTrace.jsx b/packages/api-explorer/src/BoundaryStackTrace.jsx
deleted file mode 100644
index 8de9f0e11..000000000
--- a/packages/api-explorer/src/BoundaryStackTrace.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-const React = require('react');
-const PropTypes = require('prop-types');
-
-function BoundaryStackTrace({ error, info }) {
-  return (
-    <pre style={{ whiteSpace: 'pre-wrap' }}>
-      {error.toString()}
-      {info.componentStack}
-    </pre>
-  );
-}
-
-BoundaryStackTrace.propTypes = {
-  error: PropTypes.instanceOf(Error).isRequired,
-  info: PropTypes.shape({
-    componentStack: PropTypes.string.isRequired,
-  }).isRequired,
-};
-
-module.exports = BoundaryStackTrace;
diff --git a/packages/api-explorer/src/Doc.jsx b/packages/api-explorer/src/Doc.jsx
index bed6819a7..574344c18 100644
--- a/packages/api-explorer/src/Doc.jsx
+++ b/packages/api-explorer/src/Doc.jsx
@@ -16,7 +16,7 @@ const createParams = require('./Params');
 const CodeSample = require('./CodeSample');
 const Response = require('./Response');
 const ResponseSchema = require('./ResponseSchema');
-const EndpointErrorBoundary = require('./EndpointErrorBoundary');
+const ErrorBoundary = require('./ErrorBoundary');
 
 const { Operation } = Oas;
 const parseResponse = require('./lib/parse-response');
@@ -254,13 +254,13 @@ class Doc extends React.Component {
   }
 
   renderEndpoint() {
-    const { doc } = this.props;
+    const { doc, maskErrorMessages, onError } = this.props;
     this.props.onDocRender(doc.slug);
 
     return (
-      <EndpointErrorBoundary>
+      <ErrorBoundary appContext="endpoint" maskErrorMessages={maskErrorMessages} onError={onError}>
         {this.props.appearance.referenceLayout === 'column' ? this.columnTheme(doc) : this.mainTheme(doc)}
-      </EndpointErrorBoundary>
+      </ErrorBoundary>
     );
   }
 
@@ -274,7 +274,7 @@ class Doc extends React.Component {
     return (
       <Logs
         baseUrl={this.props.baseUrl}
-        changeGroup={this.props.onGroupChange}
+        changeGroup={this.props.onAuthGroupChange}
         group={this.props.group}
         groups={this.props.groups}
         query={{
@@ -311,8 +311,8 @@ class Doc extends React.Component {
         needsAuth={this.state.needsAuth}
         oas={this.oas}
         oauth={this.props.oauth}
+        onAuthGroupChange={this.props.onAuthGroupChange}
         onChange={this.props.onAuthChange}
-        onGroupChange={this.props.onGroupChange}
         onSubmit={this.onSubmit}
         operation={this.getOperation()}
         showAuthBox={this.state.showAuthBox}
@@ -396,7 +396,7 @@ Doc.propTypes = {
         ),
       }),
       method: PropTypes.string.isRequired,
-      params: PropTypes.object,
+      params: PropTypes.arrayOf(PropTypes.object),
       results: PropTypes.shape({
         codes: PropTypes.arrayOf(PropTypes.shape({})),
       }),
@@ -423,11 +423,13 @@ Doc.propTypes = {
   language: PropTypes.string.isRequired,
   lazy: PropTypes.bool,
   Logs: PropTypes.func,
+  maskErrorMessages: PropTypes.bool,
   oas: PropTypes.shape({}),
   oauth: PropTypes.bool.isRequired,
   onAuthChange: PropTypes.func.isRequired,
+  onAuthGroupChange: PropTypes.func.isRequired,
   onDocRender: PropTypes.func.isRequired,
-  onGroupChange: PropTypes.func.isRequired,
+  onError: PropTypes.func,
   rendered: PropTypes.bool,
   setLanguage: PropTypes.func.isRequired,
   suggestedEdits: PropTypes.bool.isRequired,
@@ -449,7 +451,9 @@ Doc.defaultProps = {
   groups: [],
   lazy: true,
   Logs: undefined,
+  maskErrorMessages: true,
   oas: {},
+  onError: () => {},
   rendered: false,
   useNewMarkdownEngine: false,
   user: {},
diff --git a/packages/api-explorer/src/EndpointErrorBoundary.jsx b/packages/api-explorer/src/EndpointErrorBoundary.jsx
deleted file mode 100644
index aad0107e0..000000000
--- a/packages/api-explorer/src/EndpointErrorBoundary.jsx
+++ /dev/null
@@ -1,44 +0,0 @@
-const React = require('react');
-const PropTypes = require('prop-types');
-
-const BoundaryStackTrace = require('./BoundaryStackTrace');
-
-class EndpointErrorBoundary extends React.Component {
-  constructor(props) {
-    super(props);
-    this.state = { error: false };
-  }
-
-  componentDidCatch(error, info) {
-    this.setState({ error, info });
-    // TODO add bugsnag here?
-    // You can also log the error to an error reporting service
-    // logErrorToMyService(error, info);
-  }
-
-  render() {
-    if (this.state.error) {
-      return (
-        <div className="hub-reference-section">
-          <div className="hub-reference-left" style={{ paddingLeft: '2%' }}>
-            <h3>
-              There was an error rendering this endpoint. If you are the owner of this project please contact&nbsp;
-              <a href="mailto:support@readme.io?subject=API Explorer Error">support@readme.io</a>
-              &nbsp;with the following error:
-            </h3>
-            <BoundaryStackTrace error={this.state.error} info={this.state.info} />
-          </div>
-          <div className="hub-reference-right" />
-        </div>
-      );
-    }
-
-    return this.props.children;
-  }
-}
-
-EndpointErrorBoundary.propTypes = {
-  children: PropTypes.node.isRequired,
-};
-
-module.exports = EndpointErrorBoundary;
diff --git a/packages/api-explorer/src/ErrorBoundary.jsx b/packages/api-explorer/src/ErrorBoundary.jsx
index 8cf3adcaa..2ac39030d 100644
--- a/packages/api-explorer/src/ErrorBoundary.jsx
+++ b/packages/api-explorer/src/ErrorBoundary.jsx
@@ -1,41 +1,84 @@
 const React = require('react');
 const PropTypes = require('prop-types');
-
-const BoundaryStackTrace = require('./BoundaryStackTrace');
+const shortid = require('shortid');
 
 class ErrorBoundary extends React.Component {
   constructor(props) {
     super(props);
-    this.state = { error: false };
+
+    this.state = {
+      error: false,
+      errorCode: false,
+      info: false,
+    };
   }
 
   componentDidCatch(error, info) {
-    this.setState({ error, info });
-    // TODO add bugsnag here?
-    // You can also log the error to an error reporting service
-    // logErrorToMyService(error, info);
+    const errorEventId = `ERR-${shortid.generate()}`;
+    const errorCode = this.props.onError(error, { errorEventId, componentStack: info });
+
+    this.setState({
+      error,
+      errorCode: typeof errorCode !== 'undefined' ? errorCode : errorEventId,
+      info,
+    });
   }
 
   render() {
-    if (this.state.error) {
+    const { error, errorCode } = this.state;
+    const { appContext, children, maskErrorMessages } = this.props;
+
+    if (!error) {
+      return children;
+    }
+
+    function getErrorMessage() {
+      let msg;
+      if (appContext === 'endpoint') {
+        msg = "This endpoint's documentation is currently experiencing difficulties and will be back online shortly.";
+      } else {
+        msg = 'The API Explorer is currently experiencing difficulties and will be back online shortly.';
+      }
+
+      if (maskErrorMessages) {
+        return msg;
+      }
+
       return (
-        <div className="render-error" style={{ paddingLeft: '2%', width: '75%' }}>
-          <h3>
-            There was an error rendering the API Explorer. If you are the owner of this project please contact&nbsp;
-            <a href="mailto:support@readme.io?subject=API Explorer Error">support@readme.io</a>
-            &nbsp;with the following error:
-          </h3>
-          <BoundaryStackTrace error={this.state.error} info={this.state.info} />
-        </div>
+        <span>
+          {msg} Please contact{' '}
+          <a href={`mailto:support@readme.io?subject=API Explorer Error [${errorCode}]`}>support@readme.io</a> with your
+          error code.
+        </span>
       );
     }
 
-    return this.props.children;
+    return (
+      <div className="hub-reference-section">
+        <div className="hub-reference-left" style={{ paddingLeft: '2%' }}>
+          <div className="hub-reference-error">
+            <span aria-label="Experiencing difficulties" className="hub-reference-error-icon" role="img">
+              🚧
+            </span>
+            <p className="hub-reference-error-text">{getErrorMessage()}</p>
+            {!maskErrorMessages && errorCode && <code className="hub-reference-error-code">{errorCode}</code>}
+          </div>
+        </div>
+        <div className="hub-reference-right" />
+      </div>
+    );
   }
 }
 
 ErrorBoundary.propTypes = {
+  appContext: PropTypes.oneOf(['endpoint', 'explorer']).isRequired,
   children: PropTypes.node.isRequired,
+  maskErrorMessages: PropTypes.bool.isRequired,
+  onError: PropTypes.func,
+};
+
+ErrorBoundary.defaultProps = {
+  onError: () => {},
 };
 
 module.exports = ErrorBoundary;
diff --git a/packages/api-explorer/src/Params.jsx b/packages/api-explorer/src/Params.jsx
index f0acd5e69..391b1da41 100644
--- a/packages/api-explorer/src/Params.jsx
+++ b/packages/api-explorer/src/Params.jsx
@@ -1,11 +1,14 @@
 const React = require('react');
 const PropTypes = require('prop-types');
-const Form = require('react-jsonschema-form').default;
+const Form = require('@readme/react-jsonschema-form').default;
+const slug = require('lodash.kebabcase');
 
-// const DateTimeWidget = require('react-jsonschema-form/lib/components/widgets/DateTimeWidget').default;
-const PasswordWidget = require('react-jsonschema-form/lib/components/widgets/PasswordWidget').default;
-const TextWidget = require('react-jsonschema-form/lib/components/widgets/TextWidget').default;
-const UpDownWidget = require('react-jsonschema-form/lib/components/widgets/UpDownWidget').default;
+const {
+  // DateTimeWidget,
+  PasswordWidget,
+  TextWidget,
+  UpDownWidget,
+} = require('@readme/react-jsonschema-form/lib/components/widgets').default;
 
 const Oas = require('@readme/oas-tooling');
 const { parametersToJsonSchema } = require('@readme/oas-tooling/utils');
@@ -38,68 +41,83 @@ function Params({
 }) {
   const jsonSchema = parametersToJsonSchema(operation, oas);
 
+  // If this operation doesn't have a set operationID (it's not required per the spec!) generate a hash off the
+  // path+method to be one so we have unique form IDs across the explorer.
+  let operationId;
+  if ('operationId' in operation) {
+    operationId = operation.operationId;
+  } else {
+    operationId = slug(`${operation.method} ${operation.path}`).replace(/-/g, '');
+  }
+
   return (
-    jsonSchema &&
-    jsonSchema.map(schema => {
-      return [
-        <div key={`${schema.type}-header`} className="param-type-header">
-          <h3>{schema.label}</h3>
-          <div className="param-header-border" />
-        </div>,
-        <Form
-          key={`${schema.type}-form`}
-          fields={{
-            DescriptionField,
-            ArrayField,
-            SchemaField,
-          }}
-          formContext={{
-            useNewMarkdownEngine,
-          }}
-          formData={formData[schema.type]}
-          id={`form-${operation.operationId}`}
-          idPrefix={operation.operationId}
-          onChange={form => {
-            return onChange({ [schema.type]: form.formData });
-          }}
-          onSubmit={onSubmit}
-          schema={schema.schema}
-          widgets={{
-            // If new supported formats are added here, they must also be added to `SchemaField.getCustomType`.
-            BaseInput,
-            binary: FileWidget,
-            byte: TextWidget,
-            date: TextWidget,
-            // Temporarily disabling support for rendering the datetime widget as RJSF appears to be disabling it in
-            // browsers that don't fully support it.
-            /* dateTime: DateTimeWidget,
-            'date-time': DateTimeWidget, */
-            double: UpDownWidget,
-            duration: TextWidget,
-            float: UpDownWidget,
-            int8: UpDownWidget,
-            int16: UpDownWidget,
-            int32: UpDownWidget,
-            int64: UpDownWidget,
-            integer: UpDownWidget,
-            json: TextareaWidget,
-            password: PasswordWidget,
-            SelectWidget,
-            string: TextWidget,
-            timestamp: TextWidget,
-            uint8: UpDownWidget,
-            uint16: UpDownWidget,
-            uint32: UpDownWidget,
-            uint64: UpDownWidget,
-            uri: URLWidget,
-            url: URLWidget,
-            uuid: TextWidget,
-          }}
-        >
-          <button style={{ display: 'none' }} type="submit" />
-        </Form>,
-      ];
-    })
+    <div id={`form-${operationId}`}>
+      {jsonSchema &&
+        jsonSchema.map(schema => {
+          return [
+            <div key={`${schema.type}-header`} className="param-type-header">
+              <h3>{schema.label}</h3>
+              <div className="param-header-border" />
+            </div>,
+            <Form
+              key={`${schema.type}-form`}
+              fields={{
+                ArrayField,
+                DescriptionField,
+                SchemaField,
+              }}
+              formContext={{
+                useNewMarkdownEngine,
+              }}
+              formData={formData[schema.type]}
+              id={`form-${schema.type}-${operationId}`}
+              idPrefix={operationId}
+              onChange={form => {
+                return onChange({ [schema.type]: form.formData });
+              }}
+              onSubmit={onSubmit}
+              schema={schema.schema}
+              widgets={{
+                // 🚧 If new supported formats are added here, they must also be added to `SchemaField.getCustomType`.
+                BaseInput,
+                binary: FileWidget,
+                blob: TextareaWidget,
+                byte: TextWidget,
+                date: TextWidget,
+
+                // 🚨 Temporarily disabling support for rendering the datetime widget as RJSF appears to be disabling it in
+                // browsers that don't fully support it.
+                /* dateTime: DateTimeWidget,
+              'date-time': DateTimeWidget, */
+
+                double: UpDownWidget,
+                duration: TextWidget,
+                float: UpDownWidget,
+                html: TextareaWidget,
+                int8: UpDownWidget,
+                int16: UpDownWidget,
+                int32: UpDownWidget,
+                int64: UpDownWidget,
+                integer: UpDownWidget,
+                json: TextareaWidget,
+                password: PasswordWidget,
+                SelectWidget,
+                string: TextWidget,
+                timestamp: TextWidget,
+                uint8: UpDownWidget,
+                uint16: UpDownWidget,
+                uint32: UpDownWidget,
+                uint64: UpDownWidget,
+                uri: URLWidget,
+                url: URLWidget,
+                uuid: TextWidget,
+              }}
+            >
+              <button style={{ display: 'none' }} type="submit" />
+            </Form>,
+          ];
+        })}
+    </div>
   );
 }
 
diff --git a/packages/api-explorer/src/PathUrl.jsx b/packages/api-explorer/src/PathUrl.jsx
index b725c965d..b5dfb8f77 100644
--- a/packages/api-explorer/src/PathUrl.jsx
+++ b/packages/api-explorer/src/PathUrl.jsx
@@ -33,8 +33,8 @@ function PathUrl({
   needsAuth,
   oas,
   oauth,
+  onAuthGroupChange,
   onChange,
-  onGroupChange,
   onSubmit,
   operation,
   showAuthBox,
@@ -53,8 +53,8 @@ function PathUrl({
                 groups={groups}
                 needsAuth={needsAuth}
                 oauth={oauth}
+                onAuthGroupChange={onAuthGroupChange}
                 onChange={onChange}
-                onGroupChange={onGroupChange}
                 onSubmit={onSubmit}
                 open={showAuthBox}
                 operation={operation}
@@ -113,8 +113,8 @@ PathUrl.propTypes = {
   needsAuth: PropTypes.bool,
   oas: PropTypes.instanceOf(Oas).isRequired,
   oauth: PropTypes.bool.isRequired,
+  onAuthGroupChange: PropTypes.func.isRequired,
   onChange: PropTypes.func.isRequired,
-  onGroupChange: PropTypes.func.isRequired,
   onSubmit: PropTypes.func.isRequired,
   operation: PropTypes.instanceOf(Operation).isRequired,
   showAuthBox: PropTypes.bool,
diff --git a/packages/api-explorer/src/ResponseSchemaBody.jsx b/packages/api-explorer/src/ResponseSchemaBody.jsx
index 5a61b08a1..f67c3a03d 100644
--- a/packages/api-explorer/src/ResponseSchemaBody.jsx
+++ b/packages/api-explorer/src/ResponseSchemaBody.jsx
@@ -41,6 +41,7 @@ function ResponseSchemaBody({ schema, oas, useNewMarkdownEngine }) {
           width: '70%',
           overflow: 'hidden',
           paddingLeft: '15px',
+          wordBreak: 'break-word',
         }}
       >
         {row.name}
diff --git a/packages/api-explorer/src/form-components/ArrayField.jsx b/packages/api-explorer/src/form-components/ArrayField.jsx
index 9ae3674e8..f98e0aa96 100644
--- a/packages/api-explorer/src/form-components/ArrayField.jsx
+++ b/packages/api-explorer/src/form-components/ArrayField.jsx
@@ -2,16 +2,17 @@ const React = require('react');
 const PropTypes = require('prop-types');
 const extensions = require('@readme/oas-extensions');
 
-const BaseArrayField = require('react-jsonschema-form/lib/components/fields/ArrayField').default;
-const { getDefaultRegistry, retrieveSchema } = require('react-jsonschema-form/lib/utils');
+const BaseArrayField = require('@readme/react-jsonschema-form/lib/components/fields/ArrayField').default;
+const { getDefaultRegistry, retrieveSchema } = require('@readme/react-jsonschema-form/lib/utils');
 
 function createArrayField(oas) {
   const explorerEnabled = oas[extensions.EXPLORER_ENABLED];
 
   function hasPrimitives(props) {
     const { schema, registry = getDefaultRegistry() } = props;
-    const { definitions } = registry;
-    const itemsSchema = retrieveSchema(schema.items, definitions);
+    const { rootSchema } = registry;
+
+    const itemsSchema = retrieveSchema(schema.items, rootSchema);
 
     return itemsSchema.type !== 'array' && itemsSchema.type !== 'object';
   }
diff --git a/packages/api-explorer/src/form-components/BaseInput.jsx b/packages/api-explorer/src/form-components/BaseInput.jsx
index 75544bcae..4a0e031f0 100644
--- a/packages/api-explorer/src/form-components/BaseInput.jsx
+++ b/packages/api-explorer/src/form-components/BaseInput.jsx
@@ -1,6 +1,6 @@
 const extensions = require('@readme/oas-extensions');
 
-const BaseInput = require('react-jsonschema-form/lib/components/widgets/BaseInput').default;
+const BaseInput = require('@readme/react-jsonschema-form/lib/components/widgets/BaseInput').default;
 
 function createBaseInput(oas) {
   const explorerEnabled = oas[extensions.EXPLORER_ENABLED];
diff --git a/packages/api-explorer/src/form-components/FileWidget.jsx b/packages/api-explorer/src/form-components/FileWidget.jsx
index 4173681df..3fe0bf6ce 100644
--- a/packages/api-explorer/src/form-components/FileWidget.jsx
+++ b/packages/api-explorer/src/form-components/FileWidget.jsx
@@ -1,6 +1,6 @@
 const extensions = require('@readme/oas-extensions');
 
-const FileWidget = require('react-jsonschema-form/lib/components/widgets/FileWidget').default;
+const FileWidget = require('@readme/react-jsonschema-form/lib/components/widgets/FileWidget').default;
 
 function createFileWidget(oas) {
   const explorerEnabled = oas[extensions.EXPLORER_ENABLED];
diff --git a/packages/api-explorer/src/form-components/SchemaField.jsx b/packages/api-explorer/src/form-components/SchemaField.jsx
index 4fde0f0bf..7d4800c70 100644
--- a/packages/api-explorer/src/form-components/SchemaField.jsx
+++ b/packages/api-explorer/src/form-components/SchemaField.jsx
@@ -1,17 +1,10 @@
-// There's a bug in jsdom where Jest spits out heaps of errors from it not being able to interpret
-// this file, so let's not include this when running tests since we aren't doing visual testing
-// anyways.
-// https://github.com/jsdom/jsdom/issues/217
-if (process.env.NODE_ENV !== 'test') {
-  // eslint-disable-next-line global-require
-  require('../../style/main.scss');
-}
+require('../../style/main.scss');
 
 const React = require('react');
 const PropTypes = require('prop-types');
 
-const BaseSchemaField = require('react-jsonschema-form/lib/components/fields/SchemaField').default;
-const { ADDITIONAL_PROPERTY_FLAG } = require('react-jsonschema-form/lib/utils');
+const BaseSchemaField = require('@readme/react-jsonschema-form/lib/components/fields/SchemaField').default;
+const { ADDITIONAL_PROPERTY_FLAG, findSchemaDefinition } = require('@readme/react-jsonschema-form/lib/utils');
 
 function getDefaultNumFormat(type) {
   if (type === 'integer') return 'int32';
@@ -36,7 +29,17 @@ function getCustomType(schema) {
       if (schema.format === 'binary') return 'file';
       if (schema.format === 'dateTime') return 'date-time';
 
-      const supportedStringFormats = ['date', 'date-time', 'json', 'password', 'timestamp', 'uri', 'url'];
+      const supportedStringFormats = [
+        'blob',
+        'date',
+        'date-time',
+        'html',
+        'json',
+        'password',
+        'timestamp',
+        'uri',
+        'url',
+      ];
 
       if (supportedStringFormats.includes(schema.format)) {
         return schema.format;
@@ -59,6 +62,18 @@ function getTypeLabel(schema) {
   return type;
 }
 
+function CustomTemplateShell(props) {
+  const { classNames, help, errors, children } = props;
+
+  return (
+    <div className={`${classNames} param`}>
+      {children}
+      {errors && <div className="errors">{errors}</div>}
+      {help && <div className="help">{help}</div>}
+    </div>
+  );
+}
+
 function CustomTemplate(props) {
   const { id, classNames, label, help, required, description, errors, children, schema, onKeyChange } = props;
 
@@ -84,13 +99,31 @@ function CustomTemplate(props) {
 }
 
 function SchemaField(props) {
-  if (!doesFormatExist(props.registry.widgets, props.schema.type, props.schema.format)) props.schema.format = undefined;
+  let { schema } = props;
+
+  // If this schema is going to be loaded with a $ref, prefetch it so we'll have a schema type to work with.
+  if ('$ref' in schema) {
+    schema = Object.assign(props.schema, findSchemaDefinition(schema.$ref, props.registry.rootSchema));
+    delete schema.$ref;
+  }
+
+  if (!doesFormatExist(props.registry.widgets, schema.type, schema.format)) {
+    schema.format = undefined;
+  }
 
-  // If there's no name on this field, then it's a lone schema with no label or children and as such
-  // we shouldn't try to render it with the custom template.
-  if ('name' in props) props.registry.FieldTemplate = CustomTemplate;
+  if ('name' in props) {
+    // If there's no name on this field, then it's a lone schema with no label or children and as such we shouldn't try
+    // to render it with the custom template.
+    props.registry.FieldTemplate = CustomTemplate;
+  } else if ('oneOf' in schema || 'anyOf' in schema) {
+    // If this is a oneOf or anyOf schema, render it using a shell of a CustomTemplate that will render it within our
+    // `div.param` work so it doesn't look like hot garbage.
+    //
+    // See https://github.com/readmeio/api-explorer/pull/436#issuecomment-597428988 for more info.
+    props.registry.FieldTemplate = CustomTemplateShell;
+  }
 
-  if (props.schema.readOnly) {
+  if ('readOnly' in schema && schema.readOnly) {
     // Maybe use this when it's been merged?
     // Though that just sets `input[readonly]` which still shows
     // the input, which isnt exactly what we want
@@ -99,27 +132,30 @@ function SchemaField(props) {
     // parameters-to-json-schema because we may only have
     // a $ref at that point
     // https://github.com/mozilla-services/react-jsonschema-form/pull/888
-    return <BaseSchemaField {...props} uiSchema={{ 'ui:widget': 'hidden' }} />;
+    return <BaseSchemaField {...props} schema={schema} uiSchema={{ 'ui:widget': 'hidden' }} />;
   }
 
-  const customType = getCustomType(props.schema);
+  const customType = getCustomType(schema);
   if (customType) {
-    return <BaseSchemaField {...props} uiSchema={{ ...props.uiSchema, classNames: `field-${customType}` }} />;
+    return (
+      <BaseSchemaField {...props} schema={schema} uiSchema={{ ...props.uiSchema, classNames: `field-${customType}` }} />
+    );
   }
 
-  if (props.schema.type === 'boolean') {
-    props.schema.enumNames = ['true', 'false'];
-    return <BaseSchemaField {...props} uiSchema={{ 'ui:widget': 'select' }} />;
+  // Transform booleans from a checkbox into a dropdown.
+  if (schema.type === 'boolean') {
+    schema.enumNames = ['true', 'false'];
+    return <BaseSchemaField {...props} schema={schema} uiSchema={{ 'ui:widget': 'select' }} />;
   }
 
   // The current ReadMe manual API editor saves mixed types as "mixed type", which isn't a real type
   // that's supported by the OAS. Since we don't have knowledge as to what those types are, let's
   // just convert it to a string so the parameter will at least render out.
-  if (props.schema.type === 'mixed type') {
-    props.schema.type = 'string';
+  if (schema.type === 'mixed type') {
+    schema.type = 'string';
   }
 
-  return <BaseSchemaField {...props} />;
+  return <BaseSchemaField {...props} schema={schema} />;
 }
 
 CustomTemplate.propTypes = {
@@ -139,12 +175,21 @@ CustomTemplate.defaultProps = {
   onKeyChange: () => {},
 };
 
+CustomTemplateShell.propTypes = {
+  children: PropTypes.node.isRequired,
+  classNames: PropTypes.string.isRequired,
+  errors: PropTypes.node.isRequired,
+  help: PropTypes.node.isRequired,
+};
+
 SchemaField.propTypes = {
   registry: PropTypes.shape({
     FieldTemplate: PropTypes.func,
+    rootSchema: PropTypes.object,
     widgets: PropTypes.object,
   }).isRequired,
   schema: PropTypes.shape({
+    $ref: PropTypes.string,
     enumNames: PropTypes.array,
     format: PropTypes.string,
     readOnly: PropTypes.bool,
diff --git a/packages/api-explorer/src/form-components/SelectWidget.jsx b/packages/api-explorer/src/form-components/SelectWidget.jsx
index ac67802d3..583df4e5d 100644
--- a/packages/api-explorer/src/form-components/SelectWidget.jsx
+++ b/packages/api-explorer/src/form-components/SelectWidget.jsx
@@ -1,6 +1,6 @@
 const extensions = require('@readme/oas-extensions');
 
-const SelectWidget = require('react-jsonschema-form/lib/components/widgets/SelectWidget').default;
+const SelectWidget = require('@readme/react-jsonschema-form/lib/components/widgets/SelectWidget').default;
 
 function createSelectWidget(oas) {
   const explorerEnabled = oas[extensions.EXPLORER_ENABLED];
diff --git a/packages/api-explorer/src/form-components/TextareaWidget.jsx b/packages/api-explorer/src/form-components/TextareaWidget.jsx
index 4683fa21b..5f291addc 100644
--- a/packages/api-explorer/src/form-components/TextareaWidget.jsx
+++ b/packages/api-explorer/src/form-components/TextareaWidget.jsx
@@ -1,6 +1,6 @@
 const extensions = require('@readme/oas-extensions');
 
-const TextareaWidget = require('react-jsonschema-form/lib/components/widgets/TextareaWidget').default;
+const TextareaWidget = require('@readme/react-jsonschema-form/lib/components/widgets/TextareaWidget').default;
 
 function createTextareaWidget(oas) {
   const explorerEnabled = oas[extensions.EXPLORER_ENABLED];
diff --git a/packages/api-explorer/src/form-components/URLWidget.jsx b/packages/api-explorer/src/form-components/URLWidget.jsx
index e42d77e56..6e1e65cbe 100644
--- a/packages/api-explorer/src/form-components/URLWidget.jsx
+++ b/packages/api-explorer/src/form-components/URLWidget.jsx
@@ -1,6 +1,6 @@
 const extensions = require('@readme/oas-extensions');
 
-const URLWidget = require('react-jsonschema-form/lib/components/widgets/URLWidget').default;
+const URLWidget = require('@readme/react-jsonschema-form/lib/components/widgets/URLWidget').default;
 
 function createURLWidget(oas) {
   const explorerEnabled = oas[extensions.EXPLORER_ENABLED];
diff --git a/packages/api-explorer/src/index.jsx b/packages/api-explorer/src/index.jsx
index f77e45a5d..4bff9dcf0 100644
--- a/packages/api-explorer/src/index.jsx
+++ b/packages/api-explorer/src/index.jsx
@@ -36,7 +36,7 @@ class ApiExplorer extends React.Component {
       docRenderMap: {},
     };
 
-    this.onGroupChange = this.onGroupChange.bind(this);
+    this.onAuthGroupChange = this.onAuthGroupChange.bind(this);
     this.groups =
       this.props.variables.user.keys && this.props.variables.user.keys.map(key => ({ id: key.id, name: key.name }));
 
@@ -92,11 +92,11 @@ class ApiExplorer extends React.Component {
   }
 
   /**
-   * Change the current selected group and refresh the instance auth keys based on that selection.
+   * Change the current selected auth group and refresh the instance auth keys based on that selection.
    *
    * @param {string} group
    */
-  onGroupChange(group) {
+  onAuthGroupChange(group) {
     const { user } = this.props.variables;
     let groupName = false;
     if (user.keys) {
@@ -168,6 +168,8 @@ class ApiExplorer extends React.Component {
   }
 
   render() {
+    const { maskErrorMessages } = this.props;
+
     const docs = this.props.docs.filter(doc => {
       // If the HTTP method is something we don't support, then we shouldn't attempt to render it as a normal API
       // operation.
@@ -206,11 +208,12 @@ class ApiExplorer extends React.Component {
                         language={this.state.language}
                         lazy={this.isLazy(index)}
                         Logs={this.props.Logs}
+                        maskErrorMessages={maskErrorMessages}
                         oas={this.getOas(doc)}
                         oauth={this.props.oauth}
                         onAuthChange={this.onAuthChange}
+                        onAuthGroupChange={this.onAuthGroupChange}
                         onDocRender={this.onDocRender}
-                        onGroupChange={this.onGroupChange}
                         rendered={this.state.docRenderMap[doc.slug]}
                         setLanguage={this.setLanguage}
                         suggestedEdits={this.props.suggestedEdits}
@@ -248,8 +251,10 @@ ApiExplorer.propTypes = {
     })
   ).isRequired,
   Logs: PropTypes.func,
+  maskErrorMessages: PropTypes.bool,
   oasFiles: PropTypes.shape({}).isRequired,
   oauth: PropTypes.bool,
+  onError: PropTypes.func,
   suggestedEdits: PropTypes.bool.isRequired,
   tryItMetrics: PropTypes.func,
   useNewMarkdownEngine: PropTypes.bool,
@@ -274,14 +279,17 @@ ApiExplorer.defaultProps = {
     correctnewlines: false,
   },
   Logs: undefined,
+  maskErrorMessages: true,
   oauth: false,
+  onError: () => {},
   tryItMetrics: () => {},
   useNewMarkdownEngine: false,
 };
 
 // eslint-disable-next-line react/display-name
 module.exports = props => (
-  <ErrorBoundary>
+  // eslint-disable-next-line react/prop-types
+  <ErrorBoundary appContext="explorer" maskErrorMessages={props.maskErrorMessages} onError={props.onError}>
     <ApiExplorer {...props} />
   </ErrorBoundary>
 );
diff --git a/packages/api-explorer/style/ErrorBoundary.scss b/packages/api-explorer/style/ErrorBoundary.scss
new file mode 100644
index 000000000..bbe8f1377
--- /dev/null
+++ b/packages/api-explorer/style/ErrorBoundary.scss
@@ -0,0 +1,53 @@
+.hub-reference-error {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -moz-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-justify-content: space-around;
+  -ms-flex-pack: distribute;
+  justify-content: space-around;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+  -moz-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  margin: 1.5em auto;
+  padding: 1em;
+  -webkit-border-radius: .33em;
+  -moz-border-radius: .33em;
+  border-radius: .33em;
+  font-size: 1rem;
+  background: #f8f8f8;
+  color: #3f494e;
+
+  & > * + * {
+    margin-left: 1em;
+  }
+
+  &-icon {
+    margin: .5rem;
+    font-size: 1.5em;
+    line-height: 0;
+  }
+
+  &-text {
+    margin-top: 0;
+    margin-bottom: 0;
+    max-width: 37.5em;
+    color: inherit;
+  }
+
+  &-text a {
+    font-weight: bold;
+  }
+
+  &-code {
+    background: #e5e8ec;
+    color: #7f8693;
+    padding: .25em .4em;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+  }
+}
diff --git a/packages/api-explorer/style/main.scss b/packages/api-explorer/style/main.scss
index 35cc09d64..bda52cfb2 100644
--- a/packages/api-explorer/style/main.scss
+++ b/packages/api-explorer/style/main.scss
@@ -1,3 +1,4 @@
+@import './ErrorBoundary.scss';
 @import "./markdown-overrides.scss";
 
 /* Add margin to left- and right-sides of RJSF component. */
diff --git a/packages/markdown-magic/package-lock.json b/packages/markdown-magic/package-lock.json
index 6df429f06..2be854a00 100644
--- a/packages/markdown-magic/package-lock.json
+++ b/packages/markdown-magic/package-lock.json
@@ -903,26 +903,6 @@
         "eslint-plugin-unicorn": "^16.0.0"
       }
     },
-    "@readme/syntax-highlighter": {
-      "version": "5.0.0-alpha.4",
-      "resolved": "https://registry.npmjs.org/@readme/syntax-highlighter/-/syntax-highlighter-5.0.0-alpha.4.tgz",
-      "integrity": "sha512-GE9cEwiXdIeAYpk2jGwCI8nSmmibB5L2kX6aDSsF+r0XS0De4PGPAWFva25zxP0ilgDnUhX9ppCS7twE2pzpMg==",
-      "requires": {
-        "@readme/variable": "^5.0.0-alpha.4",
-        "codemirror": "^5.48.2",
-        "react": "^16.4.2"
-      }
-    },
-    "@readme/variable": {
-      "version": "5.0.0-alpha.4",
-      "resolved": "https://registry.npmjs.org/@readme/variable/-/variable-5.0.0-alpha.4.tgz",
-      "integrity": "sha512-UmasPql08Th5CJztmJorsz/5TgN0deQJsuwkPMpqSIw6MggXHYWTalxQhhqa9yJWzhBhO+ESQVcYuXSfBWHiPQ==",
-      "requires": {
-        "classnames": "^2.2.6",
-        "prop-types": "^15.7.2",
-        "react": "^16.4.2"
-      }
-    },
     "@sinonjs/commons": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz",
@@ -1701,11 +1681,6 @@
         }
       }
     },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
     "clean-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
@@ -1747,11 +1722,6 @@
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
       "dev": true
     },
-    "codemirror": {
-      "version": "5.52.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.0.tgz",
-      "integrity": "sha512-K2UB6zjscrfME03HeRe/IuOmCeqNpw7PLKGHThYpLbZEuKf+ZoujJPhxZN4hHJS1O7QyzEsV7JJZGxuQWVaFCg=="
-    },
     "collapse-white-space": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
diff --git a/packages/markdown/package-lock.json b/packages/markdown/package-lock.json
index cdab91764..6996dd0a6 100644
--- a/packages/markdown/package-lock.json
+++ b/packages/markdown/package-lock.json
@@ -913,26 +913,6 @@
         "eslint-plugin-unicorn": "^16.0.0"
       }
     },
-    "@readme/syntax-highlighter": {
-      "version": "5.0.0-alpha.4",
-      "resolved": "https://registry.npmjs.org/@readme/syntax-highlighter/-/syntax-highlighter-5.0.0-alpha.4.tgz",
-      "integrity": "sha512-GE9cEwiXdIeAYpk2jGwCI8nSmmibB5L2kX6aDSsF+r0XS0De4PGPAWFva25zxP0ilgDnUhX9ppCS7twE2pzpMg==",
-      "requires": {
-        "@readme/variable": "^5.0.0-alpha.4",
-        "codemirror": "^5.48.2",
-        "react": "^16.4.2"
-      }
-    },
-    "@readme/variable": {
-      "version": "5.0.0-alpha.4",
-      "resolved": "https://registry.npmjs.org/@readme/variable/-/variable-5.0.0-alpha.4.tgz",
-      "integrity": "sha512-UmasPql08Th5CJztmJorsz/5TgN0deQJsuwkPMpqSIw6MggXHYWTalxQhhqa9yJWzhBhO+ESQVcYuXSfBWHiPQ==",
-      "requires": {
-        "classnames": "^2.2.6",
-        "prop-types": "^15.7.2",
-        "react": "^16.4.2"
-      }
-    },
     "@sinonjs/commons": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz",
@@ -2706,11 +2686,6 @@
         }
       }
     },
-    "classnames": {
-      "version": "2.2.6",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
-      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
-    },
     "clean-regexp": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz",
@@ -2758,11 +2733,6 @@
       "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
       "dev": true
     },
-    "codemirror": {
-      "version": "5.52.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.52.0.tgz",
-      "integrity": "sha512-K2UB6zjscrfME03HeRe/IuOmCeqNpw7PLKGHThYpLbZEuKf+ZoujJPhxZN4hHJS1O7QyzEsV7JJZGxuQWVaFCg=="
-    },
     "collapse-white-space": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz",
diff --git a/packages/oas-to-har/package-lock.json b/packages/oas-to-har/package-lock.json
index 088b9cf84..634d33f04 100644
--- a/packages/oas-to-har/package-lock.json
+++ b/packages/oas-to-har/package-lock.json
@@ -863,10 +863,11 @@
       }
     },
     "@readme/oas-tooling": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@readme/oas-tooling/-/oas-tooling-2.1.1.tgz",
-      "integrity": "sha512-gIzonSW5P7mSYn0IFLlbMxqWSa/geDce5Vsz5O7XT231K2aQWnmOW8H1cadYQAzdBJJbjzZTNJSrKr5QJDl7yQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@readme/oas-tooling/-/oas-tooling-3.0.0.tgz",
+      "integrity": "sha512-4wpLB+ow2lwzMLpeAbfagap+sKnpP558Dr0NV1FL+g+ATngGSUBGq3n8laSHBW3nZ6OIrHchXGh1bfxqVE+9aA==",
       "requires": {
+        "jsonpointer": "^4.0.1",
         "path-to-regexp": "^6.1.0"
       }
     },
@@ -4983,6 +4984,11 @@
         }
       }
     },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
+    },
     "jsprim": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
diff --git a/packages/oas-to-har/package.json b/packages/oas-to-har/package.json
index 582933395..0670be10e 100644
--- a/packages/oas-to-har/package.json
+++ b/packages/oas-to-har/package.json
@@ -5,7 +5,7 @@
   "main": "src/index.js",
   "dependencies": {
     "@readme/oas-extensions": "^5.0.0",
-    "@readme/oas-tooling": "^2.1.1",
+    "@readme/oas-tooling": "^3.0.0",
     "querystring": "^0.2.0"
   },
   "scripts": {
diff --git a/packages/variable/__tests__/index.test.jsx b/packages/variable/__tests__/index.test.jsx
index 0a85d3cf3..0eb31b024 100644
--- a/packages/variable/__tests__/index.test.jsx
+++ b/packages/variable/__tests__/index.test.jsx
@@ -46,7 +46,7 @@ describe('single variable', () => {
     expect(variable.find('#loginDropdown')).toHaveLength(1);
   });
 
-  it.skip('should set `selected` if nothing is selected', () => {});
+  it.todo('should set `selected` if nothing is selected');
 });
 
 describe('multiple variables', () => {
@@ -115,5 +115,5 @@ describe('multiple variables', () => {
     expect(variable.state('showDropdown')).toBe(false);
   });
 
-  it.skip('should render auth dropdown if default and oauth enabled', () => {});
+  it.todo('should render auth dropdown if default and oauth enabled');
 });
diff --git a/scripts/update-example-swagger-files.js b/scripts/update-example-swagger-files.js
index 7595ab136..c14d70014 100644
--- a/scripts/update-example-swagger-files.js
+++ b/scripts/update-example-swagger-files.js
@@ -23,7 +23,4 @@ const directory = files
   })
   .reduce((prev, next) => Object.assign(prev, next));
 
-writeFileSync(
-  join(__dirname, '../example/swagger-files/directory.json'),
-  JSON.stringify(directory, null, 2),
-);
+writeFileSync(join(__dirname, '../example/swagger-files/directory.json'), JSON.stringify(directory, null, 2));