diff --git a/.gitignore b/.gitignore
index aebd7c9ecef..b18320e46b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,11 +50,17 @@ Vagrantfile
 /kitchen/cookbooks
 /log/*
 /private_certs/*
+/public/*.ico
+/public/*.png
+/public/*.svg
+/public/browserconfig.xml
+/public/manifest.json
 /public/system
 /public/user_flows
 /spec/tmp
 /test
 /tmp/*
+/vendor/assets/fonts
 /vendor/bundle
 /node_modules
 
diff --git a/.reek b/.reek
index d3182612dcd..ddb112d50fc 100644
--- a/.reek
+++ b/.reek
@@ -106,7 +106,6 @@ UtilityFunction:
     - WorkerHealthChecker::Middleware#call
     - UserEncryptedAttributeOverrides#create_fingerprint
     - LocaleHelper#locale_url_param
-    - Verify::Base#mock_vendor_partial
     - IdvSession#timed_out_vendor_error
 'app/controllers':
   InstanceVariableAssumption:
@@ -115,6 +114,7 @@ UtilityFunction:
   ControlParameter:
     exclude:
       - complete_idv_session
+      - visit_idp_from_sp_with_loa3
   DuplicateMethodCall:
     enabled: false
   FeatureEnvy:
@@ -137,7 +137,9 @@ UtilityFunction:
   UncommunicativeMethodName:
     exclude:
       - visit_idp_from_sp_with_loa1
+      - visit_idp_from_sp_with_loa3
       - visit_idp_from_mobile_app_with_loa1
+      - visit_idp_from_oidc_sp_with_loa3
   UncommunicativeParameterName:
     exclude:
       - begin_sign_up_with_sp_and_loa
diff --git a/.snyk b/.snyk
new file mode 100644
index 00000000000..07a3827ae46
--- /dev/null
+++ b/.snyk
@@ -0,0 +1,10 @@
+version: v1.38.1
+ignore:
+  'SNYK-RUBY-NOKOGIRI-20299':
+    - '* > nokogiri':
+        reason: 'We do not opt in to DTDLOAD and do not opt out of NONET'
+        expires: '2018-01-01T00:00:00.000Z'
+  'SNYK-RUBY-ACTIONCABLE-20338':
+    - '* > actioncable':
+        reason: 'We do not use actioncable'
+        expires: '2017-09-10T00:00:00.000Z'
diff --git a/.travis.yml b/.travis.yml
index 6c27c2712e0..a8d124fb2ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,7 @@ before_install:
   - nvm install stable
   - nvm use stable
   - npm install
+  - npm run build
   # Install PhantomJS 2.1.1 manually
   - "export PHANTOMJS_VERSION=2.1.1"
   - "phantomjs --version"
diff --git a/Dockerfile b/Dockerfile
index 75f3b3a2a9b..747766aa4a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,6 +24,7 @@ WORKDIR /upaya
 
 COPY package.json /upaya
 RUN npm install
+RUN npm run build
 
 COPY Gemfile /upaya
 COPY Gemfile.lock /upaya
diff --git a/Gemfile b/Gemfile
index cebbb9caaeb..00cf77b0301 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" }
 
 ruby '~> 2.3.3'
 
-gem 'rails', '~> 4.2.6'
+gem 'rails', '~> 5.1.3'
 
 gem 'ahoy_matey'
 gem 'american_date'
@@ -12,7 +12,6 @@ gem 'base32-crockford'
 gem 'browserify-rails'
 gem 'device_detector'
 gem 'devise', '~> 4.1'
-gem 'devise_security_extension'
 gem 'dotiw'
 gem 'figaro'
 gem 'foundation_emails'
@@ -38,7 +37,7 @@ gem 'redis-session-store', github: '18F/redis-session-store', branch: 'master'
 gem 'rqrcode'
 gem 'ruby-progressbar'
 gem 'ruby-saml'
-gem 'saml_idp', git: 'https://github.com/18F/saml_idp.git', tag: 'v0.4.1-18f'
+gem 'saml_idp', git: 'https://github.com/18F/saml_idp.git', tag: 'v0.4.3-18f'
 gem 'sass-rails', '~> 5.0'
 gem 'savon'
 gem 'scrypt'
@@ -74,7 +73,6 @@ group :development do
   gem 'fasterer', require: false
   gem 'guard-rspec', require: false
   gem 'overcommit', require: false
-  gem 'quiet_assets'
   gem 'rack-mini-profiler', require: false
   gem 'rails-erd'
   gem 'rails_layout'
@@ -86,7 +84,6 @@ group :development, :test do
   gem 'bullet'
   gem 'front_matter_parser'
   gem 'i18n-tasks'
-  gem 'mailcatcher', require: false
   gem 'pry-byebug'
   gem 'rspec-rails', '~> 3.5.2'
   gem 'slim_lint'
@@ -106,8 +103,8 @@ group :test do
   gem 'poltergeist'
   gem 'rack-test'
   gem 'rack_session_access'
+  gem 'rails-controller-testing'
   gem 'shoulda-matchers', '~> 3.0', require: false
-  gem 'test_after_commit'
   gem 'timecop'
   gem 'webmock'
   gem 'zonebie'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5597dc22c35..9ecc2a0fdc9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -20,19 +20,19 @@ GIT
 
 GIT
   remote: https://github.com/18F/redis-session-store.git
-  revision: 101df477da93d47cbd61fe0ead8ddca6c60ce48e
+  revision: 7400dcc1c12f458da5c5dabb0fdc7ca789a66f0b
   branch: master
   specs:
     redis-session-store (0.9.1)
-      actionpack (>= 3, < 5.1)
+      actionpack (>= 3, < 5.2)
       redis (~> 3)
 
 GIT
   remote: https://github.com/18F/saml_idp.git
-  revision: 9c1a308bb0c454bd603218f1f156a45a69cb50f2
-  tag: v0.4.1-18f
+  revision: f9917394698a3671e08058cf743e25a276887a79
+  tag: v0.4.3-18f
   specs:
-    saml_idp (0.4.0)
+    saml_idp (0.4.3.pre.18f)
       activesupport
       builder
       httparty
@@ -62,39 +62,42 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actioncable (5.1.3)
+      actionpack (= 5.1.3)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.3)
+      actionview (= 5.1.3)
+      activesupport (= 5.1.3)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (5.1.3)
+      activesupport (= 5.1.3)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
-      globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
+    activejob (5.1.3)
+      activesupport (= 5.1.3)
+      globalid (>= 0.3.6)
+    activemodel (5.1.3)
+      activesupport (= 5.1.3)
+    activerecord (5.1.3)
+      activemodel (= 5.1.3)
+      activesupport (= 5.1.3)
+      arel (~> 8.0)
+    activesupport (5.1.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
@@ -115,13 +118,13 @@ GEM
       gyoku (>= 0.4.0)
       nokogiri
     american_date (1.1.1)
-    arel (6.0.4)
+    arel (8.0.0)
     ast (2.3.0)
-    aws-sdk-core (2.10.1)
+    aws-sdk-core (2.10.23)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sigv4 (1.0.0)
-    axe-matchers (1.3.3)
+    aws-sigv4 (1.0.1)
+    axe-matchers (1.3.4)
       dumb_delegator (~> 0.8)
       virtus (~> 1.0)
     axiom-types (0.1.1)
@@ -131,24 +134,24 @@ GEM
     base32-crockford (0.1.0)
     bcrypt (3.1.11)
     benchmark-ips (2.7.2)
-    better_errors (2.1.1)
+    better_errors (2.3.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.6.6)
+      erubi (>= 1.0.0)
       rack (>= 0.9.0)
     bindata (2.4.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    brakeman (3.6.2)
+    brakeman (3.7.0)
     browser (2.4.0)
     browserify-rails (4.2.0)
       addressable (>= 2.4.0)
       railties (>= 4.0.0, < 5.2)
       sprockets (>= 3.6.0)
     builder (3.2.3)
-    bullet (5.5.1)
+    bullet (5.6.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
-    bummr (0.1.8)
+    bummr (0.2.1)
       rainbow
       thor
     byebug (9.0.6)
@@ -171,14 +174,14 @@ GEM
     capistrano-sidekiq (0.10.0)
       capistrano
       sidekiq (>= 3.4)
-    capybara (2.14.0)
+    capybara (2.15.1)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.6.3)
+    childprocess (0.7.1)
       ffi (~> 1.0, >= 1.0.11)
     choice (0.2.0)
     chronic (0.10.2)
@@ -224,14 +227,11 @@ GEM
       railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
-    devise_security_extension (0.9.2)
-      devise (>= 2.0.0)
-      rails (>= 3.1.1)
     diff-lcs (1.3)
     docile (1.1.5)
     dotenv (2.2.1)
-    dotiw (3.1.1)
-      actionpack (>= 3)
+    dotiw (4.0.0)
+      actionpack (>= 4)
       i18n
     dumb_delegator (0.8.0)
     easy_translate (0.5.0)
@@ -245,8 +245,9 @@ GEM
     encryptor (3.0.0)
     equalizer (0.0.11)
     errbase (0.0.3)
+    erubi (1.6.1)
     erubis (2.7.0)
-    eventmachine (1.0.9.1)
+    eventmachine (1.2.5)
     excon (0.57.0)
     execjs (2.7.0)
     factory_girl (4.8.0)
@@ -254,8 +255,10 @@ GEM
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faker (1.7.3)
+    faker (1.8.4)
       i18n (~> 0.5)
+    faraday (0.12.2)
+      multipart-post (>= 1.2, < 3)
     fasterer (0.3.2)
       colorize (~> 0.7)
       ruby_parser (~> 3.7)
@@ -267,7 +270,7 @@ GEM
       thor (~> 0.14)
     formatador (0.2.5)
     foundation_emails (2.2.1.0)
-    front_matter_parser (0.1.0)
+    front_matter_parser (0.1.1)
     geocoder (1.4.4)
     get_process_mem (0.2.1)
     gibberish (2.1.0)
@@ -290,19 +293,19 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashdiff (0.3.2)
-    hashie (3.5.5)
+    hashie (3.5.6)
     heapy (0.1.2)
     highline (1.7.8)
     hiredis (0.6.1)
     htmlentities (4.3.4)
-    http_accept_language (2.1.0)
-    httparty (0.15.4)
+    http_accept_language (2.1.1)
+    httparty (0.15.6)
       multi_xml (>= 0.5.2)
     httpi (2.4.2)
       rack
       socksify
     i18n (0.8.6)
-    i18n-tasks (0.9.15)
+    i18n-tasks (0.9.16)
       activesupport (>= 4.0.2)
       ast (>= 2.1.0)
       easy_translate (>= 0.5.0)
@@ -313,7 +316,7 @@ GEM
       rainbow (~> 2.2)
       terminal-table (>= 1.5.1)
     ice_nine (0.11.2)
-    iniparse (1.4.2)
+    iniparse (1.4.4)
     jmespath (1.3.1)
     json (1.8.6)
     json-jwt (1.7.2)
@@ -325,30 +328,24 @@ GEM
     jwt (1.5.6)
     launchy (2.4.3)
       addressable (~> 2.3)
+    libxml-ruby (3.0.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     logger (1.2.8)
-    lograge (0.5.1)
+    lograge (0.6.0)
       actionpack (>= 4, < 5.2)
       activesupport (>= 4, < 5.2)
       railties (>= 4, < 5.2)
+      request_store (~> 1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.11)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
-    mailcatcher (0.6.5)
-      eventmachine (= 1.0.9.1)
-      mail (~> 2.3)
-      rack (~> 1.5)
-      sinatra (~> 1.2)
-      skinny (~> 0.2.3)
-      sqlite3 (~> 1.3)
-      thin (~> 1.5.0)
     mandrill-api (1.0.53)
       excon (>= 0.16.0, < 1.0)
       json (>= 1.7.7, < 2.0)
@@ -360,17 +357,21 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
+    mini_mime (0.1.3)
     mini_portile2 (2.2.0)
-    minitest (5.10.2)
+    minitest (5.10.3)
     multi_json (1.12.1)
     multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    mustermann (1.0.0)
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (4.1.0)
-    newrelic_rpm (4.2.0.334)
+    newrelic_rpm (4.3.0.335)
+    nio4r (2.1.0)
     nokogiri (1.8.0)
       mini_portile2 (~> 2.2.0)
     nori (2.6.0)
@@ -378,19 +379,19 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     orm_adapter (0.5.0)
-    overcommit (0.39.1)
-      childprocess (~> 0.6.3)
+    overcommit (0.40.0)
+      childprocess (~> 0.6, >= 0.6.3)
       iniparse (~> 1.4)
     parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     pg (0.21.0)
-    phonelib (0.6.12)
+    phonelib (0.6.13)
     phony (2.15.44)
     phony_rails (0.14.6)
       activesupport (>= 3.0)
       phony (> 2.15)
-    poltergeist (1.15.0)
+    poltergeist (1.16.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
@@ -399,7 +400,7 @@ GEM
       addressable
       css_parser (>= 1.4.10)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.9.6)
+    premailer-rails (1.9.7)
       actionmailer (>= 3, < 6)
       premailer (~> 1.7, >= 1.7.9)
     pry (0.10.4)
@@ -410,38 +411,38 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     public_suffix (2.0.5)
-    quiet_assets (1.1.0)
-      railties (>= 3.1, < 5.0)
-    rack (1.6.8)
+    rack (2.0.3)
     rack-attack (5.0.1)
       rack
     rack-cors (0.4.1)
     rack-mini-profiler (0.10.5)
       rack (>= 1.2.0)
-    rack-protection (1.5.3)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rack_session_access (0.1.1)
       builder (>= 2.0.0)
       rack (>= 1.0.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    rails (5.1.3)
+      actioncable (= 5.1.3)
+      actionmailer (= 5.1.3)
+      actionpack (= 5.1.3)
+      actionview (= 5.1.3)
+      activejob (= 5.1.3)
+      activemodel (= 5.1.3)
+      activerecord (= 5.1.3)
+      activesupport (= 5.1.3)
+      bundler (>= 1.3.0)
+      railties (= 5.1.3)
+      sprockets-rails (>= 2.0.0)
+    rails-controller-testing (1.0.2)
+      actionpack (~> 5.x, >= 5.0.1)
+      actionview (~> 5.x, >= 5.0.1)
+      activesupport (~> 5.x)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
     rails-erd (1.5.2)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
@@ -450,9 +451,10 @@ GEM
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails_layout (1.0.41)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (5.1.3)
+      actionpack (= 5.1.3)
+      activesupport (= 5.1.3)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
@@ -466,7 +468,7 @@ GEM
       connection_pool (~> 2.1)
       redis (~> 3.0)
     redis (3.3.3)
-    reek (4.7.1)
+    reek (4.7.2)
       codeclimate-engine-rb (~> 0.4.0)
       parser (>= 2.4.0.0, < 2.5)
       rainbow (~> 2.0)
@@ -523,7 +525,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    savon (2.11.1)
+    savon (2.11.2)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
@@ -533,14 +535,14 @@ GEM
       wasabi (~> 3.4)
     scrypt (3.0.5)
       ffi-compiler (>= 1.0, < 2.0)
-    secure_headers (3.6.5)
+    secure_headers (3.6.7)
       useragent
     securecompare (1.0.0)
     sexp_processor (4.8.0)
     shellany (0.0.1)
-    shoulda-matchers (3.1.1)
+    shoulda-matchers (3.1.2)
       activesupport (>= 4.0.0)
-    sidekiq (5.0.3)
+    sidekiq (5.0.4)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
@@ -553,13 +555,11 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    skinny (0.2.4)
-      eventmachine (~> 1.0.0)
-      thin (>= 1.5, < 1.7)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
     slim (3.0.8)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 1.3.3, < 2.1)
@@ -581,7 +581,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
     sshkit (1.13.1)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
@@ -595,21 +594,19 @@ GEM
     temple (0.8.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
+    thin (1.7.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.6)
-    tilt (2.0.7)
-    timecop (0.9.0)
-    twilio-ruby (4.13.0)
-      builder (>= 2.1.2)
-      jwt (~> 1.0)
-      multi_json (>= 1.3.0)
+    tilt (2.0.8)
+    timecop (0.9.1)
+    twilio-ruby (5.1.0)
+      faraday (~> 0.9)
+      jwt (~> 1.5)
+      libxml-ruby (= 3.0.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
@@ -652,10 +649,10 @@ GEM
       xmlmapper (~> 0.6)
     xmlmapper (0.7.2)
       nokogiri (~> 1.5)
-    xpath (2.0.0)
+    xpath (2.1.0)
       nokogiri (~> 1.3)
     zonebie (0.6.1)
-    zxcvbn-js (4.4.2)
+    zxcvbn-js (4.4.3)
       execjs
 
 PLATFORMS
@@ -685,7 +682,6 @@ DEPENDENCIES
   derailed
   device_detector
   devise (~> 4.1)
-  devise_security_extension
   dotiw
   email_spec
   equifax!
@@ -705,7 +701,6 @@ DEPENDENCIES
   i18n-tasks
   json-jwt
   lograge
-  mailcatcher
   mandrill_dm
   net-sftp
   newrelic_rpm
@@ -717,13 +712,13 @@ DEPENDENCIES
   premailer-rails
   proofer!
   pry-byebug
-  quiet_assets
   rack-attack
   rack-cors
   rack-mini-profiler
   rack-test
   rack_session_access
-  rails (~> 4.2.6)
+  rails (~> 5.1.3)
+  rails-controller-testing
   rails-erd
   rails_layout
   readthis
@@ -747,7 +742,6 @@ DEPENDENCIES
   slim_lint
   stringex
   teaspoon-mocha
-  test_after_commit
   thin
   timecop
   twilio-ruby
@@ -765,4 +759,4 @@ RUBY VERSION
    ruby 2.3.3p222
 
 BUNDLED WITH
-   1.15.1
+   1.15.3
diff --git a/Procfile b/Procfile
index a4a50cd2a39..6ccc9da9196 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
 web: bundle exec rackup config.ru --port ${PORT:-3000}
 worker: bundle exec sidekiq --config config/sidekiq.yml
-mail: bundle exec mailcatcher -f
+mailcatcher: mailcatcher -f
diff --git a/README.md b/README.md
index c4aa2aba38e..9f4b9548932 100644
--- a/README.md
+++ b/README.md
@@ -125,7 +125,12 @@ more information.
 Once it is up and running, the app will be accessible at
 `http://localhost:3000/` by default.
 
-Email messages will be visible in MailCatcher at `http://localhost:1080/`.
+To view email messages, Mailcatcher must be running. You can check if it's
+running by visiting http://localhost:1080/. To run Mailcatcher:
+
+```
+$ mailcatcher
+```
 
 If you would like to run the application on a different port:
 
diff --git a/app/assets/javascripts/app/i18n-dropdown.js b/app/assets/javascripts/app/i18n-dropdown.js
index 431765f0f47..1b5b9157b29 100644
--- a/app/assets/javascripts/app/i18n-dropdown.js
+++ b/app/assets/javascripts/app/i18n-dropdown.js
@@ -1,18 +1,36 @@
 import 'classlist.js';
 
 document.addEventListener('DOMContentLoaded', () => {
-  const mobileLink = document.querySelector('.i18n-mobile-toggle');
+  const mobileLink = document.querySelector('.i18n-mobile-toggle > a');
   const mobileDropdown = document.querySelector('.i18n-mobile-dropdown');
-  const desktopLink = document.querySelector('.i18n-desktop-toggle');
+  const desktopLink = document.querySelector('.i18n-desktop-toggle > a');
   const desktopDropdown = document.querySelector('.i18n-desktop-dropdown');
 
-  function initDropdown (trigger, dropdown) {
-    trigger.addEventListener('click', function() {
-      this.classList.toggle('focused');
-      dropdown.classList.toggle('focused');
+  function addListenerMulti(el, s, fn) {
+    s.split(' ').forEach(e => el.addEventListener(e, fn, false));
+  }
+
+  function toggleAriaExpanded(element) {
+    if (element.getAttribute('aria-expanded') === 'true') {
+      element.setAttribute('aria-expanded', 'false');
+    } else {
+      element.setAttribute('aria-expanded', 'true');
+    }
+  }
+
+  function languagePicker(trigger, dropdown) {
+    addListenerMulti(trigger, 'click keypress', function(event) {
+      const eventType = event.type;
+
+      event.preventDefault();
+      if (eventType === 'click' || (eventType === 'keypress' && event.which === 13)) {
+        this.parentNode.classList.toggle('focused');
+        dropdown.classList.toggle('display-none');
+        toggleAriaExpanded(this);
+      }
     });
   }
 
-  if (mobileLink) initDropdown(mobileLink, mobileDropdown);
-  if (desktopLink) initDropdown(desktopLink, desktopDropdown);
+  if (desktopLink) languagePicker(desktopLink, desktopDropdown);
+  if (mobileLink) languagePicker(mobileLink, mobileDropdown);
 });
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 7aa578a51f0..36142a61986 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -1,18 +1,5 @@
 @import 'fonts';
 
-@import 'variables/colors';
-@import 'variables/web';
-
-// imported from node_modules
-@import 'normalize.css/normalize';
-@import 'hint.css/hint';
-
-@import 'basscss-sass/basscss';
-@import 'basscss/margin';
-@import 'basscss/padding';
-@import 'basscss/responsive-margin';
-@import 'basscss/responsive-padding';
-
-@import 'components/all';
+@import 'identity-style-guide/src/css/app';
 
 @import 'print';
diff --git a/app/assets/stylesheets/components/_abbr.scss b/app/assets/stylesheets/components/_abbr.scss
deleted file mode 100644
index 6048d5e322b..00000000000
--- a/app/assets/stylesheets/components/_abbr.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// normalize.css adds a text underline by default
-// scss-lint:disable QualifyingElement
-abbr[title] { text-decoration: none; }
diff --git a/app/assets/stylesheets/components/_accordion.scss b/app/assets/stylesheets/components/_accordion.scss
deleted file mode 100644
index 3a59a7e044c..00000000000
--- a/app/assets/stylesheets/components/_accordion.scss
+++ /dev/null
@@ -1,87 +0,0 @@
-.no-js {
-  .accordion {
-    .accordion-header {
-      cursor: initial;
-    }
-
-    .accordion-footer {
-      display: none;
-    }
-
-    .accordion-content {
-      display: block;
-    }
-
-    [class*="btn-"] {
-      display: none;
-    }
-  }
-}
-
-.accordion {
-  border: $border-width solid $border-color;
-  border-radius: $border-radius-md;
-
-  .accordion-header {
-    color: $blue;
-    cursor: pointer;
-    position: relative;
-
-    img {
-      position: absolute;
-      right: 1rem;
-      top: .8rem;
-    }
-  }
-
-  .accordion-content {
-    border-top: $border-width solid $border-color;
-    display: none;
-    opacity: 1;
-
-    &.shown {
-      display: block;
-    }
-  }
-
-  .accordion-footer {
-    background-color: $blue-lightest;
-    border-top: $border-width solid $border-color;
-    color: $blue;
-    cursor: pointer;
-    text-align: center;
-
-    img {
-      margin-top: -2px;
-      vertical-align: middle;
-    }
-  }
-}
-
-.animate-in {
-  animation: accordionIn .2s normal ease-in both 1;
-}
-
-.animate-out {
-  animation: accordionOut .15s normal ease-out both 1;
-}
-
-@keyframes accordionIn {
-  0% {
-    opacity: 0;
-  }
-
-  100% {
-    opacity: 1;
-  }
-}
-
-@keyframes accordionOut {
-  0% {
-    opacity: 1;
-  }
-
-  100% {
-    opacity: 0;
-  }
-}
diff --git a/app/assets/stylesheets/components/_alert.scss b/app/assets/stylesheets/components/_alert.scss
deleted file mode 100644
index 48dd85515eb..00000000000
--- a/app/assets/stylesheets/components/_alert.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-$ico-size: 1rem;
-$ico-offset: 1rem;
-
-.alert {
-  background-color: $blue-lighter;
-  border-radius: $space-1;
-  color: #5b616a;
-  font-size: 1rem;
-  line-height: 1.5rem;
-  margin-bottom: $space-4;
-  padding: 12px $space-2;
-  position: relative;
-
-  &::before {
-    background-image: none;
-    background-repeat: no-repeat;
-    content: '';
-    height: $ico-size;
-    left: $ico-offset;
-    position: absolute;
-    top: $ico-offset;
-    width: $ico-size;
-  }
-}
-
-.alert-success {
-  background-color: #ebfcef;
-  padding-left: $space-4;
-
-  &::before { background-image: url(image-path('alert/success.svg')); }
-}
-
-.alert-thumb {
-  background-color: #ebfcef;
-  padding-left: $space-4;
-
-  &::before { background-image: url(image-path('alert/ico-thumb.svg')); }
-}
-
-.alert-error,
-.alert-alert {
-  background-color: #fff0f3;
-  padding-left: $space-4;
-
-  &::before { background-image: url(image-path('alert/error.svg')); }
-}
-
-.alert-warning {
-  background-color: #fffdd7;
-  padding-left: $space-4;
-
-  &::before { background-image: url(image-path('alert/warning.svg')); }
-}
-
-.alert-notice {
-  padding-left: $space-4;
-  &::before { background-image: url(image-path('alert/notice.svg')); }
-}
diff --git a/app/assets/stylesheets/components/_background.scss b/app/assets/stylesheets/components/_background.scss
deleted file mode 100644
index 9c26230e10c..00000000000
--- a/app/assets/stylesheets/components/_background.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.bg-gray-lighter { background-color: $gray-lighter; }
-.bg-light-blue { background-color: $blue-light; }
-.bg-lightest-blue { background-color: $blue-lightest; }
-
-@media #{$breakpoint-sm} {
-  .sm-bg-light-blue { background-color: $blue-light; }
-  .sm-bg-none { background-color: transparent; }
-  .sm-bg-navy { background-color: $navy; }
-}
diff --git a/app/assets/stylesheets/components/_border.scss b/app/assets/stylesheets/components/_border.scss
deleted file mode 100644
index 12256d68ed6..00000000000
--- a/app/assets/stylesheets/components/_border.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-.bw1 { border-width: 1px; }
-.bw2 { border-width: 2px; }
-.bw3 { border-width: 3px; }
-.bw4 { border-width: 4px; }
-
-.border-dashed { border-style: dashed; }
-
-.rounded-md { border-radius: $border-radius-md; }
-.rounded-lg { border-radius: $border-radius-lg; }
-.rounded-xl { border-radius: $border-radius-xl; }
-.rounded-xxl { border-radius: $border-radius-xxl; }
-
-@media #{$breakpoint-sm} {
-  .sm-border-none { border: 0; }
-  .sm-rounded-md { border-radius: $border-radius-md; }
-}
diff --git a/app/assets/stylesheets/components/_btn.scss b/app/assets/stylesheets/components/_btn.scss
deleted file mode 100644
index 5f7c5d2f972..00000000000
--- a/app/assets/stylesheets/components/_btn.scss
+++ /dev/null
@@ -1,80 +0,0 @@
-@media #{$breakpoint-sm} {
-  .btn { font-size: $button-font-size-sm; }
-}
-
-.btn {
-  white-space: normal;
-}
-
-%btn-basic {
-  background: transparent;
-  border: 0;
-  box-shadow: none;
-  color: $blue;
-  font-size: $base-font-size;
-  font-weight: normal;
-  line-height: $line-height;
-  outline: none;
-  padding: 0;
-}
-
-.btn-primary {
-  border-radius: $border-radius-lg;
-}
-
-.btn-secondary {
-  border: 1px solid $blue;
-  border-radius: $border-radius-lg;
-  color: $blue;
-
-  &:hover {
-    background-color: $blue-lightest;
-  }
-}
-
-.btn-wide {
-  box-sizing: border-box;
-  min-width: 220px;
-  text-align: center;
-}
-
-.btn-transparent {
-  @extend %btn-basic;
-  cursor: pointer;
-}
-
-.btn-link {
-  @extend %btn-basic;
-  text-decoration: underline;
-  vertical-align: baseline;
-
-  &:active,
-  &:focus,
-  &:hover, {
-    border: 0;
-    box-shadow: none;
-    text-decoration: underline;
-  }
-}
-
-.btn-border {
-  border-color: $border-color;
-  border-radius: $border-radius-lg;
-  border-style: solid;
-  border-width: $border-width;
-  box-sizing: border-box;
-  display: inline-block;
-  padding: $space-1 $space-2;
-
-  &.is-focused {
-    border-color: $field-focus-color;
-    box-shadow: 0 0 0 2px rgba($field-focus-color, .5);
-    outline: none;
-  }
-}
-
-.btn-disabled {
-  background-color: $gray-light;
-  border-color: $gray;
-  color: $gray;
-}
diff --git a/app/assets/stylesheets/components/_card.scss b/app/assets/stylesheets/components/_card.scss
deleted file mode 100644
index 017d0addade..00000000000
--- a/app/assets/stylesheets/components/_card.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.card {
-  background-color: $white;
-  max-width: $container-skinny-width;
-
-  &-wide {
-    max-width: 100%;
-    padding-bottom: 0;
-    padding-left: 0;
-    padding-right: 0;
-  }
-
-  @media #{$breakpoint-sm} {
-    border-radius: 5px;
-
-    &-wide {
-      margin-top: $space-4;
-      max-width: 100%;
-      padding-bottom: 0;
-      padding-left: 0;
-      padding-right: 0;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/components/_color.scss b/app/assets/stylesheets/components/_color.scss
deleted file mode 100644
index 572de70adf1..00000000000
--- a/app/assets/stylesheets/components/_color.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-@media #{$breakpoint-sm} {
-  .sm-white { color: $white; }
-}
diff --git a/app/assets/stylesheets/components/_container.scss b/app/assets/stylesheets/components/_container.scss
deleted file mode 100644
index 5bed3a6d2c0..00000000000
--- a/app/assets/stylesheets/components/_container.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.cntnr-skinny { max-width: $container-skinny-width; }
-.cntnr-xskinny { max-width: $container-xskinny-width; }
-.cntnr-xxskinny { max-width: $container-xxskinny-width; }
-
-@media #{$breakpoint-sm} {
-  .cntnr-xxskinny { max-width: $container-xskinny-width; }
-}
diff --git a/app/assets/stylesheets/components/_footer.scss b/app/assets/stylesheets/components/_footer.scss
deleted file mode 100644
index 4b9e8042f51..00000000000
--- a/app/assets/stylesheets/components/_footer.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-// 1. Avoid the IE 10-11 `min-height` bug.
-// 2. Set `flex-shrink` to `0` to prevent some browsers from
-//    letting these items shrink to smaller than their content's default
-//    minimum size. See http://bit.ly/1Mn35US for details.
-// 3. Use `%` instead of `vh` since `vh` is buggy in older mobile Safari.
-html {
-  height: 100%;
-}
-
-.site {
-  display: flex;
-  flex-direction: column;
-  height: 100%; // 1, 3
-}
-
-.footer {
-  flex: none; // 2
-  position: relative;
-}
-
-.site-wrap {
-  flex: 1 0 auto; // 2
-  width: 100%;
-}
-
-.site-wrap::after {
-  content: '\00a0'; // &nbsp;
-  display: block;
-  height: 0;
-  visibility: hidden;
-}
diff --git a/app/assets/stylesheets/components/_form.scss b/app/assets/stylesheets/components/_form.scss
deleted file mode 100644
index 71df7c2435c..00000000000
--- a/app/assets/stylesheets/components/_form.scss
+++ /dev/null
@@ -1,272 +0,0 @@
-$radio-checkbox-space: 1.5rem;
-
-@media #{$breakpoint-sm} {
-  input,
-  select,
-  textarea {
-    font-size: $form-field-font-size-sm;
-  }
-}
-
-label {
-  display: inline-block;
-  margin-bottom: $space-tiny;
-}
-
-textarea {
-  resize: vertical;
-}
-
-.field {
-  background-color: #f2f9ff;
-  color: $gray;
-  font-weight: $bold-font-weight;
-
-  &[type=number],
-  &.phone {
-    font-family: $monospace-font-family;
-  }
-
-  &:focus,
-  &.is-focused {
-    border-color: $field-focus-color;
-    box-shadow: 0 0 0 2px rgba($field-focus-color, .5);
-    outline: none;
-  }
-
-  &:invalid,
-  &.is-error {
-    border-color: $border-color;
-  }
-}
-
-.radio-extra {
-  margin-left: $radio-checkbox-space;
-}
-
-
-// error states
-.has-error input {
-  background-image: url(image-path('alert/error.svg'));
-  background-position: center right $form-field-padding-x;
-  background-repeat: no-repeat;
-  background-size: 1rem 1rem;
-  border-color: $red;
-
-  &.date,
-  &.select {
-    background-image: none;
-  }
-
-  &:focus {
-    border-color: $red;
-    box-shadow: 0 0 0 2px rgba($red, .5);
-  }
-}
-
-// hide number field input spin box as per:
-// http://stackoverflow.com/questions/3790935/can-i-hide-the-html5-number-input-s-spin-box
-// and added .mfa class selector as per CodeClimate warning to:
-// 'Avoid qualifying attribute selectors with an element.'
-.mfa {
-  -moz-appearance: textfield;
-}
-
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  margin: 0;
-}
-
-
-// wtf-forms.css
-.checkbox,
-.radio {
-  cursor: pointer;
-  padding-left: 24px;
-  position: relative;
-}
-
-.checkbox input,
-.radio input, {
-  opacity: 0;
-  position: absolute;
-  z-index: -1;
-}
-
-// scss-lint:disable VendorPrefix
-.indicator {
-  background-position: center center;
-  background-repeat: no-repeat;
-  background-size: .5rem .5rem;
-  box-sizing: border-box;
-  display: block;
-  font-size: 65%;
-  height: 1rem;
-  left: 0;
-  line-height: 1rem;
-  position: absolute;
-  text-align: center;
-  top: .25rem;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  -webkit-user-select: none;
-  user-select: none;
-  width: 1rem;
-}
-
-.checkbox input:focus ~ .indicator,
-.radio input:focus ~ .indicator {
-  box-shadow: 0 0 0 2px rgba($blue, .5);
-}
-
-.checkbox input:checked ~ .indicator,
-.radio input:checked ~ .indicator {
-  background-color: $blue;
-  color: $white;
-}
-
-.checkbox input:active ~ .indicator,
-.radio input:active ~ .indicator {
-  background-color: $blue-light;
-  color: $white;
-}
-
-.checkbox .indicator {
-  background-color: $white;
-  border: $border-width solid $blue;
-  border-radius: .25rem;
-}
-
-.checkbox input:checked ~ .indicator {
-  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTYuNCwxTDUuNywxLjdMMi45LDQuNUwyLjEsMy43TDEuNCwzTDAsNC40bDAuNywwLjdsMS41LDEuNWwwLjcsMC43bDAuNy0wLjdsMy41LTMuNWwwLjctMC43TDYuNCwxTDYuNCwxeiINCgkvPg0KPC9zdmc+DQo=);
-}
-
-.radio .indicator {
-  background-color: #f2f9ff;
-  border: $border-width solid $blue;
-  border-radius: 50%;
-}
-
-.radio input:checked ~ .indicator {
-  background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQsMUMyLjMsMSwxLDIuMywxLDRzMS4zLDMsMywzczMtMS4zLDMtM1M1LjcsMSw0LDF6Ii8+DQo8L3N2Zz4NCg==);
-}
-
-.radio input:disabled ~ .indicator {
-  background-color: $gray-light;
-  border-color: $gray;
-}
-
-.select-alt {
-  color: $white;
-  display: inline-block;
-  position: relative;
-  width: 100%;
-
-  select {
-    -moz-appearance: none;
-    -webkit-appearance: none;
-    appearance: none;
-    background-color: $navy;
-    border-right: 1px solid $blue;
-    color: $white;
-    cursor: pointer;
-    display: inline-block;
-    font-weight: normal;
-    line-height: 1.5;
-    padding-right: 2.25rem;
-    width: 100%;
-  }
-
-  // Undo the Firefox inner focus ring
-  select:focus:-moz-focusring {
-    color: transparent;
-    text-shadow: 0 0 0 $white;
-  }
-
-  select:active {
-    background-color: $navy;
-    color: $white;
-  }
-
-  // Hide the arrow in IE10 and up
-  select::-ms-expand {
-    display: none;
-  }
-
-  // Separator
-  &::before {
-    border-right: 1px solid $blue;
-    content: '';
-    height: -moz-calc(3rem - 2px);
-    height: -webkit-calc(3rem - 2px);
-    height: calc(3rem - 2px);
-    position: absolute;
-    right: 3rem;
-    top: 1px;
-    width: 0;
-  }
-
-  // Dropdown arrow
-  &::after {
-    border-bottom: .35rem solid transparent;
-    border-left: .35rem solid transparent;
-    border-right: .35rem solid transparent;
-    border-top: .35rem solid;
-    content: '';
-    display: inline-block;
-    height: 0;
-    margin-top: -.15rem;
-    pointer-events: none;
-    position: absolute;
-    right: 1.25rem;
-    top: 50%;
-    width: 0;
-  }
-}
-
-// Media query to target Firefox only
-@-moz-document url-prefix() {
-  // Firefox hack to hide the arrow
-  .select-alt select {
-    padding-right: 1rem;
-    text-indent: .01px;
-    text-overflow: '';
-  }
-
-  // <option> elements inherit styles from <select>, so reset them.
-  .select-alt option {
-    background-color: $white;
-  }
-}
-
-// IE9 hack to hide the arrow
-@media screen and (min-width:0\0) {
-  .select-alt select {
-    padding: .5rem 1.5rem .5rem 1rem;
-    z-index: 1;
-  }
-
-  .select-alt::after {
-    z-index: 5;
-  }
-
-  .select-alt::before {
-    background-color: $navy;
-    bottom: 0;
-    content: '';
-    display: block;
-    position: absolute;
-    right: 1rem;
-    top: 0;
-    width: 1.5rem;
-    z-index: 2;
-  }
-
-  .select-alt select:hover,
-  .select-alt select:focus,
-  .select-alt select:active {
-    background-color: $navy;
-    color: $white;
-  }
-}
diff --git a/app/assets/stylesheets/components/_i18n-dropdown.scss b/app/assets/stylesheets/components/_i18n-dropdown.scss
deleted file mode 100644
index 317a9c0face..00000000000
--- a/app/assets/stylesheets/components/_i18n-dropdown.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-.i18n-mobile-toggle,
-.i18n-desktop-toggle {
-  cursor: pointer;
-
-  &.focused .caret {
-    transform: rotateX(180deg) translateY(-1px);
-  }
-}
-
-.i18n-mobile-dropdown,
-.i18n-desktop-dropdown {
-  &.focused {
-    display: block;
-  }
-}
-
-.i18n-mobile-dropdown {
-  background-color: $blue-light;
-  bottom: 100%;
-  display: none;
-  left: 0;
-  position: absolute;
-  right: 0;
-}
-
-.i18n-desktop-toggle {
-  position: relative;
-  text-decoration: none;
-
-  &.focused {
-    background-color: $blue;
-    border-radius: 0;
-    margin-bottom: 0;
-    margin-top: 0;
-    padding-bottom: 12px;
-    padding-top: 12px;
-  }
-}
-
-.i18n-desktop-dropdown {
-  background-color: $blue;
-  bottom: 100%;
-  display: none;
-  left: -1px;
-  position: absolute;
-  width: 194px;
-}
diff --git a/app/assets/stylesheets/components/_icon.scss b/app/assets/stylesheets/components/_icon.scss
deleted file mode 100644
index e8a8998efef..00000000000
--- a/app/assets/stylesheets/components/_icon.scss
+++ /dev/null
@@ -1,33 +0,0 @@
-.ico {
-  background-position: 1rem center;
-  background-repeat: no-repeat;
-  background-size: 1rem;
-  padding-left: 2.5rem;
-
-  &-refresh {
-    background-image: url(image-path('ico-refresh.svg'));
-  }
-
-  &-print {
-    background-image: url(image-path('ico-print.svg'));
-  }
-}
-
-.ico-absolute {
-  background-repeat: no-repeat;
-  background-size: $h4;
-  position: relative;
-
-  &-success {
-    &::before {
-      background-image: url(image-path('alert/success.svg'));
-      content: '';
-      display: block;
-      height: $h4;
-      left: -$space-3;
-      position: absolute;
-      top: $space-1;
-      width: $h4;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/components/_list.scss b/app/assets/stylesheets/components/_list.scss
deleted file mode 100644
index a63e614961e..00000000000
--- a/app/assets/stylesheets/components/_list.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-.circle-number {
-  font-size: 13px;
-  font-weight: bold;
-  height: 20px;
-  text-align: center;
-  width: 20px;
-}
-
-.success-bullets {
-  li {
-    padding: 1rem 1rem 1rem 0;
-
-    &::before {
-      background-image: url(image-path('alert/success.svg'));
-      background-repeat: no-repeat;
-      content: '';
-      display: inline-block;
-      height: 1rem;
-      padding-right: 1rem;
-      vertical-align: middle;
-      width: 1rem;
-    }
-  }
-}
-
-.teal-dots {
-  list-style: none;
-  padding: 0;
-
-  li {
-    padding-left: 1rem;
-    text-indent: -1rem;
-
-    &::before {
-      color: $teal;
-      content: '•';
-      font-size: 2rem;
-      line-height: 1.5rem;
-      padding-right: .5rem;
-      vertical-align: -3px;
-    }
-  }
-}
-
-.yellow-dots {
-  list-style: none;
-  padding: 0;
-
-  li {
-    padding-left: 1rem;
-    text-indent: -1rem;
-
-    &::before {
-      color: $yellow;
-      content: '•';
-      font-size: 2rem;
-      line-height: 1.5rem;
-      padding-right: .5rem;
-      vertical-align: -3px;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/components/_loading.scss b/app/assets/stylesheets/components/_loading.scss
deleted file mode 100644
index 4323690d219..00000000000
--- a/app/assets/stylesheets/components/_loading.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.loading-spinner {
-  margin: auto;
-  width: 144px;
-}
diff --git a/app/assets/stylesheets/components/_modal.scss b/app/assets/stylesheets/components/_modal.scss
deleted file mode 100644
index c73edfaf876..00000000000
--- a/app/assets/stylesheets/components/_modal.scss
+++ /dev/null
@@ -1,129 +0,0 @@
-.modal-backdrop {
-  background-color: rgba(91, 97, 106, .95);
-  display: table;
-  height: 100%;
-  left: 0;
-  position: fixed;
-  top: 0;
-  width: 100%;
-}
-
-.modal-open {
-  left: 0;
-  overflow: hidden;
-  position: fixed;
-  right: 0;
-  width: 100%;
-
-  .modal {
-    overflow-x: hidden;
-    overflow-y: scroll;
-  }
-}
-
-.modal {
-  bottom: 0;
-  display: block;
-  left: 0;
-  outline: 0;
-  overflow: hidden;
-  -webkit-overflow-scrolling: auto;
-  position: fixed;
-  right: 0;
-  top: 0;
-}
-
-.modal-center {
-  display: table;
-  height: 100%;
-  width: 100%;
-}
-
-.modal-content {
-  display: table-cell;
-  vertical-align: top;
-
-  [class^='cntnr'],
-  [class*=' cntnr'] {
-    display: block;
-    margin-left: auto;
-    margin-right: auto;
-    position: relative;
-
-    &.key-badge::before {
-      background-image: url(image-path('p-key.svg'));
-      background-repeat: no-repeat;
-      content: '';
-      height: 60px;
-      left: 45%;
-      position: absolute;
-      top: -25px;
-      width: 60px;
-    }
-
-    &[class^='modal-']::before,
-    &[class*=' modal-']::before {
-      background-repeat: no-repeat;
-      content: '';
-      display: block;
-      height: 48px;
-      margin: $space-2 auto $space-3;
-      position: relative;
-      width: 48px;
-    }
-
-    hr {
-      width: 7.5rem;
-    }
-
-  }
-
-}
-
-@media #{$breakpoint-sm} {
-  .modal-content {
-    vertical-align: middle;
-  }
-}
-
-.modal-ico {
-  left: 0;
-  margin-left: auto;
-  margin-right: auto;
-  position: absolute;
-  right: 0;
-  top: -25px;
-  width: 50px;
-}
-
-.modal-timeout {
-  &::before {
-    background-image: url(image-path('clock.svg'));
-  }
-
-  hr {
-    border-color: $teal;
-  }
-}
-
-.modal-warning {
-  &::before {
-    background-image: url(image-path('alert/warning-lg.svg'));
-  }
-
-  .btn-wide,
-  hr {
-    border-color: $yellow;
-  }
-}
-
-.modal-fail {
-  &::before {
-    background-image: url(image-path('alert/fail-lg.svg'));
-  }
-
-  hr,
-  .btn {
-    border-color: $pink;
-  }
-}
diff --git a/app/assets/stylesheets/components/_nav.scss b/app/assets/stylesheets/components/_nav.scss
deleted file mode 100644
index 7fdb70533b2..00000000000
--- a/app/assets/stylesheets/components/_nav.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-.nav-branded {
-  height: 56px;
-
-  a { line-height: 14px; }
-}
-
-.nav-nonbranded {
-  height: 38px;
-
-  a { line-height: 14px; }
-}
-
-@media #{$breakpoint-sm} {
-  .nav-branded,
-  .nav-nonbranded {
-    height: 72px;
-  }
-
-  .nav-nonbranded {
-    a { line-height: 17px; }
-    img { height: 17px; }
-  }
-}
diff --git a/app/assets/stylesheets/components/_password.scss b/app/assets/stylesheets/components/_password.scss
deleted file mode 100644
index 5561b1382bb..00000000000
--- a/app/assets/stylesheets/components/_password.scss
+++ /dev/null
@@ -1,32 +0,0 @@
-// password strength module
-
-$weak: #e80e0e;
-$so-so: #ffac00;
-$good: #9ac056;
-$great: #00b200;
-
-.pw-bar {
-  background-color: #e9e9e9;
-  border: $space-tiny solid #fff;
-  border-radius: 6px;
-  box-sizing: border-box;
-  float: left;
-  height: 16px;
-  width: 25%;
-}
-
-.pw-weak {
-  .pw-bar:nth-child(-n+1) { background-color: $weak; }
-}
-
-.pw-so-so {
-  .pw-bar:nth-child(-n+2) { background-color: $so-so; }
-}
-
-.pw-good {
-  .pw-bar:nth-child(-n+3) { background-color: $good; }
-}
-
-.pw-great {
-  .pw-bar { background-color: $great; }
-}
diff --git a/app/assets/stylesheets/components/_personal-key.scss b/app/assets/stylesheets/components/_personal-key.scss
deleted file mode 100644
index 2add0346dcc..00000000000
--- a/app/assets/stylesheets/components/_personal-key.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-.key-badge::before {
-  background-image: url(image-path('p-key.svg'));
-  background-repeat: no-repeat;
-  content: '';
-  height: 60px;
-  left: 45%;
-  position: absolute;
-  top: -25px;
-  width: 60px;
-}
-
-.separator-text > div {
-  &::after {
-    color: $silver;
-    content: '-';
-    padding: 0 .25rem;
-  }
-
-  &:last-child::after {
-    content: none;
-    padding: 0;
-  }
-}
-
-.ico-scissors {
-  left: -5px;
-  top: -14px;
-}
-
-@media #{$breakpoint-sm} {
-  .separator-text > div {
-    &::after {
-      padding: 0 .5rem;
-    }
-  }
-}
diff --git a/app/assets/stylesheets/components/_position.scss b/app/assets/stylesheets/components/_position.scss
deleted file mode 100644
index e626d9e1453..00000000000
--- a/app/assets/stylesheets/components/_position.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-.top-n16 { top: -16px; }
-.top-n24 { top: -24px; }
diff --git a/app/assets/stylesheets/components/_profile-section.scss b/app/assets/stylesheets/components/_profile-section.scss
deleted file mode 100644
index dcfeea6a3e0..00000000000
--- a/app/assets/stylesheets/components/_profile-section.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.profile-info-box {
-  border: 0;
-  border-bottom: $border-width solid $border-color;
-  border-radius: 0;
-  margin-bottom: 0;
-
-  .bg-lightest-blue img {
-    margin-top: -2px;
-    vertical-align: middle;
-  }
-}
-
-@media #{$breakpoint-sm} {
-  .profile-info-box {
-    border: $border-width solid $border-color;
-    border-radius: $border-radius-md;
-    margin-bottom: $space-3;
-  }
-}
diff --git a/app/assets/stylesheets/components/_space-addon.scss b/app/assets/stylesheets/components/_space-addon.scss
deleted file mode 100644
index 3f9de2cf4bb..00000000000
--- a/app/assets/stylesheets/components/_space-addon.scss
+++ /dev/null
@@ -1,69 +0,0 @@
-.m5 { margin: $space-5; }
-.mt5 { margin-top: $space-5; }
-.mr5 { margin-right: $space-5; }
-.mb5 { margin-bottom: $space-5; }
-.ml5 { margin-left: $space-5; }
-.mx5 { margin-left: $space-5; margin-right: $space-5; }
-.my5 { margin-bottom: $space-5; margin-top: $space-5; }
-.mxn5 { margin-left: -$space-5; margin-right: -$space-5; }
-
-.m6 { margin: $space-6; }
-.mt6 { margin-top: $space-6; }
-.mr6 { margin-right: $space-6; }
-.mb6 { margin-bottom: $space-6; }
-.ml6 { margin-left: $space-6; }
-.mx6 { margin-left: $space-6; margin-right: $space-6; }
-.my6 { margin-bottom: $space-6; margin-top: $space-6; }
-.mxn6 { margin-left: -$space-6; margin-right: -$space-6; }
-
-.p5 { padding: $space-5; }
-.pt5 { padding-top: $space-5; }
-.pr5 { padding-right: $space-5; }
-.pb5 { padding-bottom: $space-5; }
-.pl5 { padding-left: $space-5; }
-.py5 { padding-bottom: $space-5; padding-top: $space-5; }
-.px5 { padding-left: $space-5; padding-right: $space-5; }
-
-.p6 { padding: $space-6; }
-.pt6 { padding-top: $space-6; }
-.pr6 { padding-right: $space-6; }
-.pb6 { padding-bottom: $space-6; }
-.pl6 { padding-left: $space-6; }
-.py6 { padding-bottom: $space-6; padding-top: $space-6; }
-.px6 { padding-left: $space-6; padding-right: $space-6; }
-
-@media #{$breakpoint-sm} {
-  .sm-m5 { margin: $space-5; }
-  .sm-mt5 { margin-top: $space-5; }
-  .sm-mr5 { margin-right: $space-5; }
-  .sm-mb5 { margin-bottom: $space-5; }
-  .sm-ml5 { margin-left: $space-5; }
-  .sm-mx5 { margin-left: $space-5; margin-right: $space-5; }
-  .sm-my5 { margin-bottom: $space-5; margin-top: $space-5; }
-  .sm-mxn5 { margin-left: -$space-5; margin-right: -$space-5; }
-
-  .sm-m6 { margin: $space-6; }
-  .sm-mt6 { margin-top: $space-6; }
-  .sm-mr6 { margin-right: $space-6; }
-  .sm-mb6 { margin-bottom: $space-6; }
-  .sm-ml6 { margin-left: $space-6; }
-  .sm-mx6 { margin-left: $space-6; margin-right: $space-6; }
-  .sm-my6 { margin-bottom: $space-6; margin-top: $space-6; }
-  .sm-mxn6 { margin-left: -$space-6; margin-right: -$space-6; }
-
-  .sm-p5 { padding: $space-5; }
-  .sm-pt5 { padding-top: $space-5; }
-  .sm-pr5 { padding-right: $space-5; }
-  .sm-pb5 { padding-bottom: $space-5; }
-  .sm-pl5 { padding-left: $space-5; }
-  .sm-px5 { padding-left: $space-5; padding-right: $space-5; }
-  .sm-py5 { padding-bottom: $space-5; padding-top: $space-5; }
-
-  .sm-p6 { padding: $space-6; }
-  .sm-pt6 { padding-top: $space-6; }
-  .sm-pr6 { padding-right: $space-6; }
-  .sm-pb6 { padding-bottom: $space-6; }
-  .sm-pl6 { padding-left: $space-6; }
-  .sm-px6 { padding-left: $space-6; padding-right: $space-6; }
-  .sm-py6 { padding-bottom: $space-6; padding-top: $space-6; }
-}
diff --git a/app/assets/stylesheets/components/_space-misc.scss b/app/assets/stylesheets/components/_space-misc.scss
deleted file mode 100644
index df019512724..00000000000
--- a/app/assets/stylesheets/components/_space-misc.scss
+++ /dev/null
@@ -1,31 +0,0 @@
-// additional, ad-hoc spacing utilities added as needed
-
-.mxn-tiny { margin-left: -$space-tiny; margin-right: -$space-tiny; }
-.mb-tiny { margin-bottom: $space-tiny; }
-.ml-tiny { margin-left: $space-tiny; }
-.mr-tiny { margin-right: $space-tiny; }
-.mt-tiny { margin-top: $space-tiny; }
-.pb-tiny { padding-bottom: $space-tiny; }
-.pt-tiny { padding-top: $space-tiny; }
-.px-tiny { padding-left: $space-tiny; padding-right: $space-tiny; }
-.py-tiny { padding-bottom: $space-tiny; padding-top: $space-tiny; }
-
-.mb-12p { margin-bottom: 12px; }
-.mt-12p { margin-top: 12px; }
-.px-12p { padding-left: 12px; padding-right: 12px; }
-.py-12p { padding-bottom: 12px; padding-top: 12px; }
-
-.pl-24p { padding-left: 24px; }
-
-.mb-40p { margin-bottom: 40px; }
-
-.mtn1 { margin-top: -$space-1; }
-.mtn2 { margin-top: -$space-2; }
-.mtn3 { margin-top: -$space-3; }
-
-@media #{$breakpoint-sm} {
-  .sm-mr-20p { margin-right: 20px; }
-  .sm-ml-28p { margin-left: 28px; }
-  .sm-mtn2 { margin-top: -$space-2; }
-  .sm-mtn3 { margin-top: -$space-3; }
-}
diff --git a/app/assets/stylesheets/components/_tooltip.scss b/app/assets/stylesheets/components/_tooltip.scss
deleted file mode 100644
index 774cb4f0a7d..00000000000
--- a/app/assets/stylesheets/components/_tooltip.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-[class*="hint--"] {
-  cursor: help;
-  font-style: normal;
-  font-weight: normal;
-  letter-spacing: normal;
-  text-transform: none;
-
-  &::after {
-    font-size: $h6;
-    line-height: 1.3;
-    min-width: 125px;
-    white-space: normal;
-    width: 100%;
-  }
-
-  &:focus::before,
-  &:focus::after {
-    opacity: 1;
-    transition-delay: 100ms;
-    visibility: visible;
-  }
-}
-
-.hint--top {
-  &:focus::before {
-    transform: translateY(-8px);
-  }
-
-  &:focus::after {
-    transform: translateX(-50%) translateY(-8px);
-  }
-}
-
-.hint--no-animate {
-  &::before,
-  &::after {
-    visibility: hidden;
-  }
-
-  &:focus::before,
-  &:focus::after,
-  &:hover::before,
-  &:hover::after {
-    visibility: visible;
-  }
-}
-
-.img-tooltip {
-  vertical-align: middle;
-}
diff --git a/app/assets/stylesheets/components/_typography.scss b/app/assets/stylesheets/components/_typography.scss
deleted file mode 100644
index f1397b4070d..00000000000
--- a/app/assets/stylesheets/components/_typography.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-html { font-size: $base-font-size; }
-body { -webkit-font-smoothing: antialiased; }
-
-.monospace { font-family: $monospace-font-family; }
-.sans-serif { font-family: $sans-serif-font-family; }
-.serif { font-family: $serif-font-family; }
-
-.text-decoration-none { text-decoration: none; }
-
-.lower { text-transform: lowercase; }
-
-.ls-0 { letter-spacing: 0; }
-.ls-05 { letter-spacing: .5px; }
-.ls-5 { letter-spacing: 5px; }
-
-.fs-12p { font-size: 12px; }
-.fs-13p { font-size: 13px; }
-.fs-20p { font-size: 20px; }
-
-.caps {
-  letter-spacing: $caps-letter-spacing;
-  text-transform: uppercase;
-}
-
-.line-height-1 { line-height: $line-height-1; }
-.line-height-2 { line-height: $line-height-2; }
-.line-height-3 { line-height: $line-height-3; }
-.line-height-4 { line-height: $line-height-4; }
-
-.underline { text-decoration: underline; }
-
-// given how similar & coupled these are, single line preferred
-// scss-lint:disable SingleLinePerSelector
-h1, .h1 { font-size: $h1; }
-h2, .h2 { font-size: $h2; }
-h3, .h3 { font-size: $h3; }
-h4, .h4 { font-size: $h4; }
-h5, .h5 { font-size: $h5; }
-h6, .h6 { font-size: $h6; }
-
-@media #{$breakpoint-sm} {
-  h1, .h1 { font-size: $sm-h1; }
-  h2, .h2 { font-size: $sm-h2; }
-  h3, .h3 { font-size: $sm-h3; }
-  h4, .h4 { font-size: $sm-h4; }
-  h5, .h5 { font-size: $sm-h5; }
-  h6, .h6 { font-size: $sm-h6; }
-}
diff --git a/app/assets/stylesheets/components/_util.scss b/app/assets/stylesheets/components/_util.scss
deleted file mode 100644
index e7eae1c18a6..00000000000
--- a/app/assets/stylesheets/components/_util.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-// supplemental utility classes
-
-.w-60p { width: 60px; }
-
-.no-hover-decoration:hover { text-decoration: none; }
-
-.invisible { visibility: hidden; }
-
-.truncate-inline {
-  max-width: 80%;
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.vertical-align::before {
-  content: ' ';
-  display: inline-block;
-  height: 100%;
-  vertical-align: middle;
-}
-
-.block-center {
-  margin: 0 auto;
-}
-
-.js-fallback {
-  display: none;
-}
-
-.no-js {
-  .js-fallback {
-    display: block;
-  }
-}
-
-.scale-down {
-  // trigger anti-aliasing in chrome
-  backface-visibility: hidden;
-  transform: scale(.7);
-}
-
-@media #{$breakpoint-sm} {
-  // scss-lint:disable ImportantRule
-  .sm-display-inline-block { display: inline-block !important; }
-  // scss-lint:enable ImportantRule
-
-  .sm-maxw-190p { max-width: 190px; }
-
-  .sm-left-align { text-align: left; }
-  .sm-right-align { text-align: right; }
-}
diff --git a/app/assets/stylesheets/components/_verification-badge.scss b/app/assets/stylesheets/components/_verification-badge.scss
deleted file mode 100644
index 0abcb3446f0..00000000000
--- a/app/assets/stylesheets/components/_verification-badge.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-.verification-badge {
-  left: 0;
-  position: absolute;
-  right: 0;
-  text-align: center;
-  top: $space-1;
-
-  span {
-    background-color: $white;
-    border: 1px solid $green;
-    border-radius: $border-radius-xxl;
-    box-sizing: border-box;
-    display: inline-block;
-    padding: $space-1 $space-2;
-    white-space: nowrap;
-  }
-}
-
-@media #{$breakpoint-sm} {
-  .verification-badge {
-    margin: -$space-1 0 0;
-    position: static;
-    text-align: right;
-  }
-}
diff --git a/app/assets/stylesheets/components/all.scss b/app/assets/stylesheets/components/all.scss
deleted file mode 100644
index 71f8a80ed93..00000000000
--- a/app/assets/stylesheets/components/all.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-@import 'abbr';
-@import 'alert';
-@import 'background';
-@import 'border';
-@import 'btn';
-@import 'card';
-@import 'color';
-@import 'container';
-@import 'footer';
-@import 'form';
-@import 'icon';
-@import 'list';
-@import 'loading';
-@import 'modal';
-@import 'nav';
-@import 'password';
-@import 'profile-section';
-@import 'personal-key';
-@import 'position';
-@import 'tooltip';
-@import 'icon';
-@import 'accordion';
-@import 'util';
-@import 'verification-badge';
-
-@import 'space-addon';
-@import 'space-misc';
-@import 'typography';
-@import 'i18n-dropdown';
diff --git a/app/assets/stylesheets/email.css.scss b/app/assets/stylesheets/email.css.scss
index a6f37cb8389..58ff9b3d8f1 100644
--- a/app/assets/stylesheets/email.css.scss
+++ b/app/assets/stylesheets/email.css.scss
@@ -1,5 +1,4 @@
-@import 'variables/colors';
-@import 'variables/email';
+@import 'identity-style-guide/src/css/email';
 
 @import 'foundation-emails';
 
diff --git a/app/assets/stylesheets/variables/_colors.scss b/app/assets/stylesheets/variables/_colors.scss
deleted file mode 100644
index 84545970702..00000000000
--- a/app/assets/stylesheets/variables/_colors.scss
+++ /dev/null
@@ -1,23 +0,0 @@
-$aqua: #7fdbff !default;
-$blue: #0071bb !default;
-$blue-light: #ebf3fa !default;
-$blue-lighter: #ecfcff !default;
-$blue-lightest: #f2f9ff !default;
-$navy: #112e51 !default;
-$teal: #00bfe7 !default;
-$green: #68e380 !default;
-$olive: #3d9970 !default;
-$lime: #01ff70 !default;
-$yellow: #e1ce28 !default;
-$orange: #ff851b !default;
-$red: #e21c3d !default;
-$fuchsia: #f012be !default;
-$purple: #b10dc9 !default;
-$maroon: #85144b !default;
-$white: #fff !default;
-$silver: #d9dadb !default;
-$gray: #5b616a !default;
-$gray-light: #ddd !default;
-$gray-lighter: #fafafa !default;
-$black: #111 !default;
-$pink: #eb4d67 !default;
diff --git a/app/assets/stylesheets/variables/_email.scss b/app/assets/stylesheets/variables/_email.scss
deleted file mode 100644
index 86c391d1cf9..00000000000
--- a/app/assets/stylesheets/variables/_email.scss
+++ /dev/null
@@ -1,145 +0,0 @@
-//  Foundation for Emails Settings
-//  ------------------------------
-//
-//  Table of Contents:
-//
-//   1. Global
-//   2. Grid
-//   3. Block Grid
-//   4. Typography
-//   5. Button
-//   6. Callout
-//   7. Menu
-//   8. Thumbnail
-
-
-// 1. Global
-// ---------
-
-$primary-color: $blue;
-$secondary-color: $navy;
-$success-color: #3adb76;
-$warning-color: #ffae00;
-$alert-color: #ec5840;
-$light-gray: #f3f3f3;
-$medium-gray: #cacaca;
-$dark-gray: #212121;
-$pre-color: #ff6908;
-$global-width: 580px;
-$global-width-small: 95%;
-$global-gutter: 60px;
-$global-gutter-small: 16px;
-$body-background: $blue-light;
-$container-background: $white;
-$global-padding: 16px;
-$global-margin: 16px;
-$global-radius: 5px;
-$global-rounded: 500px;
-$global-breakpoint: 596px;
-
-// 2. Grid
-// -------
-
-$grid-column-count: 12;
-$column-padding-bottom: $global-padding;
-$container-radius: 5px;
-
-// 3. Block Grid
-// -------------
-
-$block-grid-max: 8;
-$block-grid-gutter: $global-gutter;
-
-// 4. Typography
-// -------------
-
-$global-font-color: $gray;
-$body-font-family: Arial, Helvetica, sans-serif;
-$global-font-weight: normal;
-$header-color: inherit;
-$global-line-height: 1.3;
-$global-font-size: 13px;
-$body-line-height: 17px;
-$header-font-family: $body-font-family;
-$header-font-weight: $global-font-weight;
-$h1-font-size: 34px;
-$h2-font-size: 30px;
-$h3-font-size: 28px;
-$h4-font-size: 24px;
-$h5-font-size: 20px;
-$h6-font-size: 18px;
-$header-margin-bottom: 10px;
-$paragraph-margin-bottom: 10px;
-$small-font-size: 80%;
-$small-font-color: $medium-gray;
-$lead-font-size: $global-font-size * 1.25;
-$lead-line-height: 1.6;
-$text-padding: 10px;
-$subheader-lineheight: 1.4;
-$subheader-color: $dark-gray;
-$subheader-font-weight: $global-font-weight;
-$subheader-margin-top: 4px;
-$subheader-margin-bottom: 8px;
-$hr-width: $global-width;
-$hr-border: 2px solid $blue-light;
-$hr-margin: 10px auto;
-$anchor-text-decoration: none;
-$anchor-color: $primary-color;
-$anchor-color-visited: $anchor-color;
-$anchor-color-hover: darken($primary-color, 10%);
-$anchor-color-active: $anchor-color-hover;
-$stat-font-size: 40px;
-
-// 5. Button
-// ---------
-
-$button-padding: (
-  tiny: 4px 8px 4px 8px,
-  small: 5px 10px 5px 10px,
-  default: 8px 16px 8px 16px,
-  large: 10px 20px 10px 20px,
-);
-$button-font-size: (
-  tiny: 10px,
-  small: 12px,
-  default: 16px,
-  large: 20px,
-);
-$button-color: $white;
-$button-color-alt: $medium-gray;
-$button-font-weight: bold;
-$button-margin: 0 0 $global-margin 0;
-$button-background: $primary-color;
-$button-border: 2px solid $button-background;
-$button-radius: $global-radius;
-$button-rounded: $global-rounded;
-
-// 6. Callout
-// ----------
-
-$callout-background: $white;
-$callout-background-fade: 85%;
-$callout-padding: 10px;
-$callout-margin-bottom: $global-margin;
-$callout-border: 1px solid darken($callout-background, 20%);
-$callout-border-secondary: 1px solid darken($secondary-color, 20%);
-$callout-border-success: 1px solid darken($success-color, 20%);
-$callout-border-warning: 1px solid darken($warning-color, 20%);
-$callout-border-alert: 1px solid darken($alert-color, 20%);
-
-// 7. Menu
-// -------
-
-$menu-item-padding: 10px;
-$menu-item-gutter: 10px;
-$menu-item-color: $primary-color;
-
-// 8. Thumbnail
-// ------------
-
-$thumbnail-border: solid 4px $white;
-$thumbnail-margin-bottom: $global-margin;
-$thumbnail-shadow: 0 0 0 1px rgba($black, .2);
-$thumbnail-shadow-hover: 0 0 6px 1px rgba($primary-color, .5);
-$thumbnail-transition: box-shadow 200ms ease-out;
-$thumbnail-radius: $global-radius;
diff --git a/app/assets/stylesheets/variables/_web.scss b/app/assets/stylesheets/variables/_web.scss
deleted file mode 100644
index 6a7c2abae08..00000000000
--- a/app/assets/stylesheets/variables/_web.scss
+++ /dev/null
@@ -1,105 +0,0 @@
-$serif-font-family: "Merriweather", "Georgia", "Cambria", "Times New Roman", "Times", serif !default;
-$sans-serif-font-family: "Source Sans Pro", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif !default;
-$monospace-font-family: 'Source Code Pro', Consolas, monospace !default;
-
-$base-font-size: 16px !default;
-
-$body-color: $gray !default;
-$body-background-color: $white !default;
-
-$font-family: $sans-serif-font-family !default;
-$line-height: 1.5 !default;
-$bold-font-weight: bold !default;
-$heading-font-family: $serif-font-family !default;
-$heading-font-weight: bold !default;
-$heading-line-height: 1.3 !default;
-$caps-letter-spacing: 1px !default;
-
-$line-height-1: 1 !default;
-$line-height-2: 1.3 !default;
-$line-height-3: 1.75 !default;
-$line-height-4: 2 !default;
-
-$h1: 1.75rem !default;
-$h2: 1.5rem !default;
-$h3: 1.125rem !default;
-$h4: .875rem !default;
-$h5: .75rem !default;
-$h6: .75rem !default;
-
-$sm-h1: 2.5rem !default;
-$sm-h2: 2rem !default;
-$sm-h3: 1.5rem !default;
-$sm-h4: 1.125rem !default;
-$sm-h5: .875rem !default;
-$sm-h6: .8125rem !default;
-
-$space-tiny: .25rem !default;
-
-$space-1: .5rem !default;
-$space-2: 1rem !default;
-$space-3: 2rem !default;
-$space-4: 3rem !default;
-$space-5: 4rem !default;
-$space-6: 5rem !default;
-
-$form-field-font-size: 1rem !default;
-$form-field-font-size-sm: 1.25rem !default;
-$form-field-height: 3rem !default;
-$form-field-padding-y: .5rem !default;
-$form-field-padding-x: 1rem !default;
-
-$button-font-size: 1rem !default;
-$button-font-size-sm: 1.25rem !default;
-$button-font-weight: bold !default;
-$button-line-height: 1.375rem !default;
-$button-padding-y: .75rem !default;
-$button-padding-x: 1.5rem !default;
-$button-color: $white !default;
-$button-background-color: $blue !default;
-
-$link-color: $blue !default;
-$link-text-decoration: underline !default;
-$link-hover-text-decoration: underline !default;
-
-$darken-1: rgba(0, 0, 0, .0625) !default;
-$darken-2: rgba(0, 0, 0, .125) !default;
-$darken-3: rgba(0, 0, 0, .25) !default;
-$darken-4: rgba(0, 0, 0, .5) !default;
-
-$lighten-1: rgba(255, 255, 255, .0625) !default;
-$lighten-2: rgba(255, 255, 255, .125) !default;
-$lighten-3: rgba(255, 255, 255, .25) !default;
-$lighten-4: rgba(255, 255, 255, .5) !default;
-
-$border-width: 1px !default;
-$border-radius: 2px !default;
-$border-radius-md: 6px !default;
-$border-radius-lg: 8px !default;
-$border-radius-xl: 16px !default;
-$border-radius-xxl: 24px !default;
-$border-color: #cedced !default;
-
-$table-header-font-weight: $bold-font-weight !default;
-$table-cell-padding-x: $space-2 !default;
-$table-cell-padding-y: .25rem !default;
-$table-border-color: $border-color !default;
-$table-bg-accent: #f9f9f9 !default;
-$table-bg-hover: #f5f5f5 !default;
-
-$width-1: 3rem !default;
-$width-2: 6rem !default;
-$width-3: 12rem !default;
-$width-4: 24rem !default;
-
-$breakpoint-sm: '(min-width: 40em)' !default;
-$breakpoint-md: '(min-width: 52em)' !default;
-$breakpoint-lg: '(min-width: 64em)' !default;
-$breakpoint-xl: '(min-width: 96em)' !default;
-$breakpoint-sm-md: '(min-width: 40em) and (max-width: 52em)' !default;
-$breakpoint-md-lg: '(min-width: 52em) and (max-width: 64em)' !default;
-
-$container-width: 940px !default;
-$container-skinny-width: 620px !default;
-$container-xskinny-width: 416px !default;
-$container-xxskinny-width: 296px !default;
diff --git a/app/controllers/concerns/phone_confirmation.rb b/app/controllers/concerns/phone_confirmation.rb
index efb5507ed35..a149de08add 100644
--- a/app/controllers/concerns/phone_confirmation.rb
+++ b/app/controllers/concerns/phone_confirmation.rb
@@ -1,20 +1,20 @@
 module PhoneConfirmation
-  def prompt_to_confirm_phone(phone:, context: 'confirmation')
+  def prompt_to_confirm_phone(phone:, context: 'confirmation', selected_delivery_method: nil)
     user_session[:unconfirmed_phone] = phone
     user_session[:context] = context
 
     redirect_to otp_send_path(
-      otp_delivery_selection_form: { otp_delivery_preference: otp_delivery_method(phone) }
+      otp_delivery_selection_form: {
+        otp_delivery_preference: otp_delivery_method(phone, selected_delivery_method),
+      }
     )
   end
 
   private
 
-  def otp_delivery_method(phone)
-    if PhoneNumberCapabilities.new(phone).sms_only?
-      :sms
-    else
-      current_user.otp_delivery_preference
-    end
+  def otp_delivery_method(phone, selected_delivery_method)
+    return :sms if PhoneNumberCapabilities.new(phone).sms_only?
+    return selected_delivery_method if selected_delivery_method.present?
+    current_user.otp_delivery_preference
   end
 end
diff --git a/app/controllers/concerns/saml_idp_auth_concern.rb b/app/controllers/concerns/saml_idp_auth_concern.rb
index c2b5e8f9e91..25f1fe2ac85 100644
--- a/app/controllers/concerns/saml_idp_auth_concern.rb
+++ b/app/controllers/concerns/saml_idp_auth_concern.rb
@@ -11,7 +11,9 @@ module SamlIdpAuthConcern
   private
 
   def validate_service_provider_and_authn_context
-    @result = SamlRequestValidator.new.call(
+    @saml_request_validator = SamlRequestValidator.new
+
+    @result = @saml_request_validator.call(
       service_provider: current_service_provider,
       authn_context: requested_authn_context
     )
@@ -19,7 +21,7 @@ def validate_service_provider_and_authn_context
     return if @result.success?
 
     analytics.track_event(Analytics::SAML_AUTH, @result.to_h)
-    render nothing: true, status: :unauthorized
+    render 'saml_idp/auth/error', status: :bad_request
   end
 
   def store_saml_request
diff --git a/app/controllers/openid_connect/token_controller.rb b/app/controllers/openid_connect/token_controller.rb
index c9a4be5517d..75d572b645b 100644
--- a/app/controllers/openid_connect/token_controller.rb
+++ b/app/controllers/openid_connect/token_controller.rb
@@ -13,7 +13,7 @@ def create
     end
 
     def options
-      render nothing: true
+      head :ok
     end
   end
 end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index a71f9bbf158..4f8011e7a9c 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -4,6 +4,6 @@ class PagesController < ApplicationController
   skip_before_action :disable_caching
 
   def page_not_found
-    render layout: false, status: 404
+    render layout: false, status: 404, formats: :html
   end
 end
diff --git a/app/controllers/service_provider_controller.rb b/app/controllers/service_provider_controller.rb
index 9f5a9dc4674..327848bf5d3 100644
--- a/app/controllers/service_provider_controller.rb
+++ b/app/controllers/service_provider_controller.rb
@@ -17,7 +17,7 @@ def authorize
     if authorization_token == Figaro.env.dashboard_api_token
       yield
     else
-      render nothing: true, status: 401
+      head :unauthorized
     end
   end
 
diff --git a/app/controllers/users/reset_passwords_controller.rb b/app/controllers/users/reset_passwords_controller.rb
index a013e63565f..c5c29134ece 100644
--- a/app/controllers/users/reset_passwords_controller.rb
+++ b/app/controllers/users/reset_passwords_controller.rb
@@ -94,7 +94,7 @@ def handle_successful_password_reset
     end
 
     def handle_unsuccessful_password_reset(result)
-      if result.errors[:reset_password_token]
+      if result.errors[:reset_password_token].present?
         flash[:error] = t('devise.passwords.token_expired')
         redirect_to new_user_password_path
         return
diff --git a/app/controllers/users/two_factor_authentication_controller.rb b/app/controllers/users/two_factor_authentication_controller.rb
index f83ae1c6bfc..6fbfa73fbf0 100644
--- a/app/controllers/users/two_factor_authentication_controller.rb
+++ b/app/controllers/users/two_factor_authentication_controller.rb
@@ -14,11 +14,9 @@ def show
     end
 
     def send_code
-      @otp_delivery_selection_form = OtpDeliverySelectionForm.new(current_user, phone_to_deliver_to)
+      result = otp_delivery_selection_form.submit(delivery_params)
 
-      result = @otp_delivery_selection_form.submit(delivery_params)
-
-      track_otp_delivery_selection_event(result)
+      analytics.track_event(Analytics::OTP_DELIVERY_SELECTION, result.to_h)
 
       if result.success?
         handle_valid_otp_delivery_preference(user_selected_otp_delivery_preference)
@@ -29,6 +27,14 @@ def send_code
 
     private
 
+    def otp_delivery_selection_form
+      OtpDeliverySelectionForm.new(
+        current_user,
+        phone_to_deliver_to,
+        context
+      )
+    end
+
     def reauthn_param
       otp_form = params.permit(otp_delivery_selection_form: [:reauthn])
       super || otp_form.dig(:otp_delivery_selection_form, :reauthn)
@@ -61,11 +67,6 @@ def send_user_otp(method)
       )
     end
 
-    def track_otp_delivery_selection_event(result)
-      attributes = result.to_h.merge(context: context)
-      analytics.track_event(Analytics::OTP_DELIVERY_SELECTION, attributes)
-    end
-
     def user_selected_otp_delivery_preference
       delivery_params[:otp_delivery_preference]
     end
diff --git a/app/controllers/verify/otp_delivery_method_controller.rb b/app/controllers/verify/otp_delivery_method_controller.rb
new file mode 100644
index 00000000000..94084649740
--- /dev/null
+++ b/app/controllers/verify/otp_delivery_method_controller.rb
@@ -0,0 +1,57 @@
+module Verify
+  class OtpDeliveryMethodController < ApplicationController
+    include IdvSession
+    include PhoneConfirmation
+
+    before_action :confirm_phone_step_complete
+    before_action :confirm_step_needed
+    before_action :set_otp_delivery_method_presenter
+    before_action :set_otp_delivery_selection_form
+
+    def new; end
+
+    def create
+      result = @otp_delivery_selection_form.submit(otp_delivery_selection_params)
+      if result.success?
+        prompt_to_confirm_phone(
+          phone: idv_session.params[:phone],
+          context: 'idv',
+          selected_delivery_method: @otp_delivery_selection_form.otp_delivery_preference
+        )
+      else
+        render :new
+      end
+    end
+
+    private
+
+    def confirm_phone_step_complete
+      redirect_to verify_review_path if idv_session.vendor_phone_confirmation != true
+    end
+
+    def confirm_step_needed
+      redirect_to verify_review_path if idv_session.address_verification_mechanism != 'phone' ||
+                                        idv_session.user_phone_confirmation == true
+    end
+
+    def otp_delivery_selection_params
+      params.require(:otp_delivery_selection_form).permit(
+        :otp_delivery_preference
+      )
+    end
+
+    def set_otp_delivery_method_presenter
+      @set_otp_delivery_method_presenter = OtpDeliveryMethodPresenter.new(
+        idv_session.params[:phone]
+      )
+    end
+
+    def set_otp_delivery_selection_form
+      @otp_delivery_selection_form = OtpDeliverySelectionForm.new(
+        current_user,
+        idv_session.params[:phone],
+        'idv'
+      )
+    end
+  end
+end
diff --git a/app/controllers/verify/phone_controller.rb b/app/controllers/verify/phone_controller.rb
index ca6f2bc11f1..cf15b1fdbc6 100644
--- a/app/controllers/verify/phone_controller.rb
+++ b/app/controllers/verify/phone_controller.rb
@@ -2,7 +2,6 @@ module Verify
   class PhoneController < ApplicationController
     include IdvStepConcern
     include IdvFailureConcern
-    include PhoneConfirmation
 
     before_action :confirm_step_needed
     before_action :confirm_step_allowed
@@ -43,20 +42,14 @@ def show
 
     def redirect_to_next_step
       if phone_confirmation_required?
-        prompt_to_confirm_phone(phone: idv_session.params[:phone], context: 'idv')
+        redirect_to verify_otp_delivery_method_url
       else
         redirect_to verify_review_url
       end
     end
 
     def phone_confirmation_required?
-      normalized_phone = idv_session.params[:phone]
-      return false if normalized_phone.blank?
-
-      formatted_phone = normalized_phone.phony_formatted(
-        format: :international, normalize: :US, spaces: ' '
-      )
-      formatted_phone != current_user.phone
+      idv_session.user_phone_confirmation != true
     end
 
     def submit_idv_job
@@ -88,7 +81,7 @@ def step_params
     end
 
     def confirm_step_needed
-      redirect_to_next_step if idv_session.vendor_phone_confirmation == true
+      redirect_to_next_step if idv_session.user_phone_confirmation == true
     end
 
     def idv_form
diff --git a/app/controllers/verify/sessions_controller.rb b/app/controllers/verify/sessions_controller.rb
index 21031c957db..51fa5f27cd4 100644
--- a/app/controllers/verify/sessions_controller.rb
+++ b/app/controllers/verify/sessions_controller.rb
@@ -112,7 +112,7 @@ def idv_form
     end
 
     def initialize_idv_session
-      idv_session.params.merge!(profile_params)
+      idv_session.params = profile_params.to_h
       idv_session.applicant = idv_session.vendor_params
     end
 
diff --git a/app/forms/idv/profile_form.rb b/app/forms/idv/profile_form.rb
index 7d2912f44b5..e15ee0ddfac 100644
--- a/app/forms/idv/profile_form.rb
+++ b/app/forms/idv/profile_form.rb
@@ -85,7 +85,7 @@ def dob_is_sane
 
       return if date && dob_in_the_past?(date)
 
-      errors.set :dob, [I18n.t('idv.errors.bad_dob')]
+      errors.add :dob, I18n.t('idv.errors.bad_dob')
     end
 
     def dob_in_the_past?(date)
diff --git a/app/forms/openid_connect_logout_form.rb b/app/forms/openid_connect_logout_form.rb
index b122dfbc7c9..a2169f01b2d 100644
--- a/app/forms/openid_connect_logout_form.rb
+++ b/app/forms/openid_connect_logout_form.rb
@@ -43,8 +43,11 @@ def submit
               :success
 
   def load_identity
-    payload, _headers = JWT.decode(id_token_hint, RequestKeyManager.private_key.public_key, true,
-                                   algorithm: 'RS256').map(&:with_indifferent_access)
+    payload, _headers = JWT.decode(
+      id_token_hint, RequestKeyManager.private_key.public_key, true,
+      algorithm: 'RS256', leeway: Float::INFINITY
+    ).map(&:with_indifferent_access)
+
     Identity.where(
       uuid: payload[:sub],
       service_provider: payload[:aud]
diff --git a/app/forms/otp_delivery_selection_form.rb b/app/forms/otp_delivery_selection_form.rb
index 4ed925264a5..adf171eed1b 100644
--- a/app/forms/otp_delivery_selection_form.rb
+++ b/app/forms/otp_delivery_selection_form.rb
@@ -5,9 +5,10 @@ class OtpDeliverySelectionForm
 
   validates :otp_delivery_preference, inclusion: { in: %w[sms voice] }
 
-  def initialize(user, phone_to_deliver_to)
+  def initialize(user, phone_to_deliver_to, context)
     @user = user
     @phone_to_deliver_to = phone_to_deliver_to
+    @context = context
   end
 
   def submit(params)
@@ -16,7 +17,7 @@ def submit(params)
 
     @success = valid?
 
-    if success && otp_delivery_preference_changed?
+    if should_update_user?
       user_attributes = { otp_delivery_preference: otp_delivery_preference }
       UpdateUser.new(user: user, attributes: user_attributes).call
     end
@@ -28,18 +29,27 @@ def submit(params)
 
   attr_writer :otp_delivery_preference
   attr_accessor :resend
-  attr_reader :success, :user, :phone_to_deliver_to
+  attr_reader :success, :user, :phone_to_deliver_to, :context
+
+  def idv_context?
+    context == 'idv'
+  end
 
   def otp_delivery_preference_changed?
     otp_delivery_preference != user.otp_delivery_preference
   end
 
+  def should_update_user?
+    success && otp_delivery_preference_changed? && !idv_context?
+  end
+
   def extra_analytics_attributes
     {
       otp_delivery_preference: otp_delivery_preference,
       resend: resend,
       country_code: parsed_phone.country_code,
       area_code: parsed_phone.area_code,
+      context: context,
     }
   end
 
diff --git a/app/forms/verify_account_form.rb b/app/forms/verify_account_form.rb
index 8de596fde01..90aebb5782b 100644
--- a/app/forms/verify_account_form.rb
+++ b/app/forms/verify_account_form.rb
@@ -3,6 +3,7 @@ class VerifyAccountForm
 
   validates :otp, presence: true
   validate :validate_otp
+  validate :validate_otp_not_expired
   validate :validate_pending_profile
 
   attr_accessor :otp, :pii_attributes
@@ -30,6 +31,12 @@ def pending_profile
     @_pending_profile ||= user.decorate.pending_profile
   end
 
+  def validate_otp_not_expired
+    return unless Idv::UspsMail.new(user).most_recent_otp_expired?
+
+    errors.add :otp, :usps_otp_expired
+  end
+
   def validate_pending_profile
     errors.add :base, :no_pending_profile unless pending_profile
   end
diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
new file mode 100644
index 00000000000..a009ace51cc
--- /dev/null
+++ b/app/jobs/application_job.rb
@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end
diff --git a/app/jobs/sms_otp_sender_job.rb b/app/jobs/sms_otp_sender_job.rb
index ccfe06a0d04..6ddb96da3a2 100644
--- a/app/jobs/sms_otp_sender_job.rb
+++ b/app/jobs/sms_otp_sender_job.rb
@@ -1,4 +1,4 @@
-class SmsOtpSenderJob < ActiveJob::Base
+class SmsOtpSenderJob < ApplicationJob
   queue_as :sms
 
   def perform(code:, phone:, otp_created_at:)
@@ -17,7 +17,7 @@ def send_otp(twilio_service, code, phone)
       to: phone,
       body: I18n.t('jobs.sms_otp_sender_job.message', code: code, app: APP_NAME)
     )
-  rescue Twilio::REST::RequestError => error
+  rescue Twilio::REST::RestError => error
     sanitize_phone_number(error.message)
     raise
   end
diff --git a/app/jobs/vendor_validator_job.rb b/app/jobs/vendor_validator_job.rb
index cf0f13ac295..dcee7297d44 100644
--- a/app/jobs/vendor_validator_job.rb
+++ b/app/jobs/vendor_validator_job.rb
@@ -1,4 +1,4 @@
-class VendorValidatorJob < ActiveJob::Base
+class VendorValidatorJob < ApplicationJob
   queue_as :idv
 
   def perform(result_id:, vendor_validator_class:, vendor:, vendor_params:, applicant_json:,
diff --git a/app/jobs/voice_otp_sender_job.rb b/app/jobs/voice_otp_sender_job.rb
index d95c1090eff..d16399d6c32 100644
--- a/app/jobs/voice_otp_sender_job.rb
+++ b/app/jobs/voice_otp_sender_job.rb
@@ -1,4 +1,4 @@
-class VoiceOtpSenderJob < ActiveJob::Base
+class VoiceOtpSenderJob < ApplicationJob
   queue_as :voice
 
   def perform(code:, phone:, otp_created_at:)
diff --git a/app/models/app_setting.rb b/app/models/app_setting.rb
index 9de09cff3a2..312014c3dfe 100644
--- a/app/models/app_setting.rb
+++ b/app/models/app_setting.rb
@@ -1,4 +1,4 @@
-class AppSetting < ActiveRecord::Base
+class AppSetting < ApplicationRecord
   validates :name, presence: true, uniqueness: true
 
   validates :value,
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
new file mode 100644
index 00000000000..10a4cba84df
--- /dev/null
+++ b/app/models/application_record.rb
@@ -0,0 +1,3 @@
+class ApplicationRecord < ActiveRecord::Base
+  self.abstract_class = true
+end
diff --git a/app/models/authorization.rb b/app/models/authorization.rb
index 1545b6ef99c..5453d159314 100644
--- a/app/models/authorization.rb
+++ b/app/models/authorization.rb
@@ -1,4 +1,4 @@
-class Authorization < ActiveRecord::Base
+class Authorization < ApplicationRecord
   belongs_to :user
   validates :user_id, :uid, :provider, presence: true
   validates :uid, uniqueness: { scope: :provider, case_sensitive: false }
diff --git a/app/models/concerns/user_encrypted_attribute_overrides.rb b/app/models/concerns/user_encrypted_attribute_overrides.rb
index 9c1b7d04d72..c6f868632ec 100644
--- a/app/models/concerns/user_encrypted_attribute_overrides.rb
+++ b/app/models/concerns/user_encrypted_attribute_overrides.rb
@@ -27,11 +27,11 @@ def create_fingerprint(email)
   # use email_fingerprint_changed? instead of email_changed?
   # This is necessary because email is no longer an ActiveRecord
   # attribute and all the *_changed and *_was magic no longer works.
-  def email_changed?
+  def will_save_change_to_email?
     email_fingerprint_changed?
   end
 
-  def email_was
+  def email_in_database
     EncryptedAttribute.new(encrypted_email_was).decrypted if encrypted_email_was.present?
   end
 
diff --git a/app/models/event.rb b/app/models/event.rb
index 55f5a058f4f..da13b90967b 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,4 +1,4 @@
-class Event < ActiveRecord::Base
+class Event < ApplicationRecord
   belongs_to :user
 
   enum event_type: {
diff --git a/app/models/identity.rb b/app/models/identity.rb
index 1cb96cc3f78..293bd636ea0 100644
--- a/app/models/identity.rb
+++ b/app/models/identity.rb
@@ -1,4 +1,4 @@
-class Identity < ActiveRecord::Base
+class Identity < ApplicationRecord
   include NonNullUuid
 
   belongs_to :user
diff --git a/app/models/otp_requests_tracker.rb b/app/models/otp_requests_tracker.rb
index 8ce5017e8d3..2a9f263a218 100644
--- a/app/models/otp_requests_tracker.rb
+++ b/app/models/otp_requests_tracker.rb
@@ -1,4 +1,4 @@
-class OtpRequestsTracker < ActiveRecord::Base
+class OtpRequestsTracker < ApplicationRecord
   def self.find_or_create_with_phone(phone)
     tries ||= 1
     phone ||= phone.strip
diff --git a/app/models/profile.rb b/app/models/profile.rb
index bd5c0d759ad..7f74da26ef7 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -1,4 +1,4 @@
-class Profile < ActiveRecord::Base
+class Profile < ApplicationRecord
   belongs_to :user
 
   validates :active, uniqueness: { scope: :user_id, if: :active? }
diff --git a/app/models/service_provider.rb b/app/models/service_provider.rb
index e31d6f1e223..68fea443217 100644
--- a/app/models/service_provider.rb
+++ b/app/models/service_provider.rb
@@ -1,6 +1,6 @@
 require 'fingerprinter'
 
-class ServiceProvider < ActiveRecord::Base
+class ServiceProvider < ApplicationRecord
   scope(:active, -> { where(active: true) })
 
   def self.from_issuer(issuer)
diff --git a/app/models/service_provider_request.rb b/app/models/service_provider_request.rb
index 947b1aeda20..8b5e32f218f 100644
--- a/app/models/service_provider_request.rb
+++ b/app/models/service_provider_request.rb
@@ -1,4 +1,4 @@
-class ServiceProviderRequest < ActiveRecord::Base
+class ServiceProviderRequest < ApplicationRecord
   def self.from_uuid(uuid)
     find_by(uuid: uuid) || NullServiceProviderRequest.new
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 938337ec35a..8d5d5fcaa44 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,4 @@
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   include NonNullUuid
 
   after_validation :set_default_role, if: :new_record?
@@ -8,7 +8,6 @@ class User < ActiveRecord::Base
     :database_authenticatable,
     :recoverable,
     :registerable,
-    :session_limitable,
     :timeoutable,
     :trackable,
     :two_factor_authenticatable,
diff --git a/app/models/usps_confirmation.rb b/app/models/usps_confirmation.rb
index d063e367c02..c232c3cc32d 100644
--- a/app/models/usps_confirmation.rb
+++ b/app/models/usps_confirmation.rb
@@ -1,4 +1,4 @@
-class UspsConfirmation < ActiveRecord::Base
+class UspsConfirmation < ApplicationRecord
   def decrypted_entry
     UspsConfirmationEntry.new_from_encrypted(entry)
   end
diff --git a/app/presenters/verify/otp_delivery_method_presenter.rb b/app/presenters/verify/otp_delivery_method_presenter.rb
new file mode 100644
index 00000000000..d0eb7a8d6d3
--- /dev/null
+++ b/app/presenters/verify/otp_delivery_method_presenter.rb
@@ -0,0 +1,24 @@
+module Verify
+  class OtpDeliveryMethodPresenter
+    attr_reader :phone
+
+    delegate :sms_only?, to: :phone_number_capabilites
+
+    def initialize(phone)
+      @phone = PhoneFormatter.new.format(phone)
+    end
+
+    def phone_unsupported_message
+      I18n.t(
+        'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported',
+        location: phone_number_capabilites.unsupported_location
+      )
+    end
+
+    private
+
+    def phone_number_capabilites
+      @phone_number_capabilites ||= PhoneNumberCapabilities.new(phone)
+    end
+  end
+end
diff --git a/app/services/idv/usps_mail.rb b/app/services/idv/usps_mail.rb
index 26b9193049f..07337ebb74d 100644
--- a/app/services/idv/usps_mail.rb
+++ b/app/services/idv/usps_mail.rb
@@ -2,6 +2,7 @@ module Idv
   class UspsMail
     MAX_MAIL_EVENTS = Figaro.env.max_mail_events.to_i
     MAIL_EVENTS_WINDOW_DAYS = Figaro.env.max_mail_events_window_in_days.to_i
+    USPS_CONFIRMATION_WINDOW_DAYS = Figaro.env.usps_confirmation_max_days.to_i
 
     def initialize(current_user)
       @current_user = current_user
@@ -16,6 +17,12 @@ def any_mail_sent?
       user_mail_events.any?
     end
 
+    def most_recent_otp_expired?
+      return false unless any_mail_sent?
+
+      user_mail_events.first.updated_at < USPS_CONFIRMATION_WINDOW_DAYS.days.ago
+    end
+
     private
 
     attr_reader :current_user
diff --git a/app/services/service_provider_updater.rb b/app/services/service_provider_updater.rb
index 6b58a8da3fc..e2491cc6e2b 100644
--- a/app/services/service_provider_updater.rb
+++ b/app/services/service_provider_updater.rb
@@ -23,7 +23,7 @@ def update_cache(issuer, service_provider)
     if service_provider['active'] == true
       create_or_update_service_provider(issuer, service_provider)
     else
-      ServiceProvider.destroy_all(issuer: issuer, native: false)
+      ServiceProvider.where(issuer: issuer, native: false).destroy_all
     end
   end
 
diff --git a/app/view_models/verify/base.rb b/app/view_models/verify/base.rb
index 46d0c291aa0..c31b052e948 100644
--- a/app/view_models/verify/base.rb
+++ b/app/view_models/verify/base.rb
@@ -11,14 +11,6 @@ def initialize(error: nil, remaining_attempts:, idv_form:, timed_out: nil)
 
     attr_reader :error, :remaining_attempts, :idv_form
 
-    def mock_vendor_partial
-      if FeatureManagement.no_pii_mode?
-        'verify/sessions/no_pii_warning'
-      else
-        'shared/null'
-      end
-    end
-
     def title
       I18n.t("idv.titles.#{step_name}")
     end
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index ccac1c14bb4..31dc2adbb3a 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -12,7 +12,10 @@ html lang="#{I18n.locale}" class='no-js'
       meta http-equiv="refresh" content="#{yield(:meta_refresh)}"
 
     title
-      = content_for?(:title) ? APP_NAME + ' - ' + yield(:title) : APP_NAME
+      = APP_NAME
+      - if content_for?(:title)
+        = ' - '
+        = yield(:title)
 
     == stylesheet_link_tag 'application', media: 'all'
     <!--[if IE 8]>
diff --git a/app/views/saml_idp/auth/error.html.slim b/app/views/saml_idp/auth/error.html.slim
new file mode 100644
index 00000000000..d9679fcb1ef
--- /dev/null
+++ b/app/views/saml_idp/auth/error.html.slim
@@ -0,0 +1,3 @@
+ul
+  - @saml_request_validator.errors.full_messages.each do |message|
+    li = message
diff --git a/app/views/shared/_footer_lite.html.slim b/app/views/shared/_footer_lite.html.slim
index d1a5983e6ee..69f3db61956 100644
--- a/app/views/shared/_footer_lite.html.slim
+++ b/app/views/shared/_footer_lite.html.slim
@@ -3,33 +3,42 @@
 footer.footer.bg-light-blue.sm-bg-navy
   - if show_language_dropdown
     .sm-hide.border-bottom
-      .container.py1.px2.lg-px0.h5
-        .center
-          span.i18n-mobile-toggle.block.text-decoration-none.blue.fs-13p
-            = image_tag asset_url('globe-blue.svg'), width: 12, class: 'mr1', alt: ''
+      .container.cntnr-wide.py1.px2.lg-px0.h5
+        .i18n-mobile-toggle.center
+          = link_to '#', class: 'block text-decoration-none blue fs-13p',
+            'aria-expanded': 'false' do
+            = image_tag asset_url('globe-blue.svg'), width: 12, class: 'mr1', alt: '',
+              'aria-hidden': 'true'
             = t('i18n.language')
-            span.caret.inline-block.ml-tiny
+            span.caret.inline-block.ml-tiny(aria-hidden="true")
               | &#9662;
-    .i18n-mobile-dropdown.sm-hide
+    .i18n-mobile-dropdown.sm-hide.display-none
       ul.list-reset.mb0.white.center
         - I18n.available_locales.each do |locale|
           li.border-bottom
-            = link_to t("i18n.locale.#{locale}"), { locale: locale },
+            = link_to t("i18n.locale.#{locale}"),
+              request.query_parameters.merge(locale: locale),
               class: 'block py-12p px2 text-decoration-none blue fs-13p'
+
   .container.py1.px2.lg-px0(class="#{'sm-py0' if show_language_dropdown}")
     .flex.flex-center
       .flex.flex-center
         - if show_language_dropdown
-          .i18n-desktop-toggle.sm-show.white.my1.mr3.px1.py-tiny.border.border-blue.rounded-lg
-            = image_tag asset_url('globe-white.svg'), width: 12, class: 'mr1', alt: ''
-            = t('i18n.language')
-            span.caret.inline-block.ml-tiny
-              | &#9662;
-            .i18n-desktop-dropdown
-              ul.list-reset.mb0.white
-                  - I18n.available_locales.each do |locale|
-                    li.border-bottom.border-navy
-                      = link_to t("i18n.locale.#{locale}"), { locale: locale },
+          ul.list-reset.sm-show.mb0
+            li.i18n-desktop-toggle.flex.my1.mr3.relative
+              = link_to '#',
+                class: 'white text-decoration-none border border-blue rounded-lg px1 py-tiny',
+                'aria-expanded': 'false' do
+                = image_tag asset_url('globe-white.svg'), width: 12, class: 'mr1', alt: '',
+                  'aria-hidden': 'true'
+                = t('i18n.language')
+                span.caret.inline-block.ml-tiny(aria-hidden="true")
+                  | &#9662;
+              ul.i18n-desktop-dropdown.list-reset.mb0.white.display-none
+                - I18n.available_locales.each do |locale|
+                  li.border-bottom.border-navy
+                    = link_to t("i18n.locale.#{locale}"),
+                      request.query_parameters.merge(locale: locale),
                       class: 'block pl-24p py2 text-decoration-none white'
         = link_to t('links.help'), MarketingSite.help_url,
           class: 'caps h6 blue sm-white text-decoration-none mr3', target: '_blank'
diff --git a/app/views/users/shared/_otp_delivery_preference_selection.html.slim b/app/views/users/shared/_otp_delivery_preference_selection.html.slim
index 0d95b2d61f3..e9bd13b2cc2 100644
--- a/app/views/users/shared/_otp_delivery_preference_selection.html.slim
+++ b/app/views/users/shared/_otp_delivery_preference_selection.html.slim
@@ -7,7 +7,7 @@
           class: :otp_delivery_preference_sms
         span.indicator
         = t('devise.two_factor_authentication.otp_delivery_preference.sms')
-    label.btn-border.col-12.sm-col-5
+    label.btn-border.col-12.sm-col-5.mb0
       .radio
         = radio_button_tag 'user_phone_form[otp_delivery_preference]', :voice, false,
           class: :otp_delivery_preference_voice
diff --git a/app/views/verify/finance/new.html.slim b/app/views/verify/finance/new.html.slim
index 1e4f881b2f0..f4107356784 100644
--- a/app/views/verify/finance/new.html.slim
+++ b/app/views/verify/finance/new.html.slim
@@ -1,5 +1,4 @@
 - title @view_model.title
-= render @view_model.mock_vendor_partial
 
 h1.h3.my0 = @view_model.title
 p.mt-tiny.mb0
diff --git a/app/views/verify/finance_other/new.html.slim b/app/views/verify/finance_other/new.html.slim
index 29f6e7f4665..fc71e2a30b9 100644
--- a/app/views/verify/finance_other/new.html.slim
+++ b/app/views/verify/finance_other/new.html.slim
@@ -1,5 +1,4 @@
 - title @view_model.title
-= render @view_model.mock_vendor_partial
 
 h1.h3.my0 = @view_model.title
 p.mt-tiny.mb0 = t('idv.messages.finance.intro_account')
diff --git a/app/views/verify/otp_delivery_method/new.html.slim b/app/views/verify/otp_delivery_method/new.html.slim
new file mode 100644
index 00000000000..18a82b882c2
--- /dev/null
+++ b/app/views/verify/otp_delivery_method/new.html.slim
@@ -0,0 +1,33 @@
+h1.h3.my0 = t('idv.titles.otp_delivery_method')
+p = t('idv.messages.otp_delivery_method.phone_number_html',
+      phone: @set_otp_delivery_method_presenter.phone)
+= simple_form_for(@otp_delivery_selection_form, url: verify_otp_delivery_method_url,
+  html: { autocomplete: 'off', method: 'put', role: 'form', class: 'mt2' }) do |f|
+  fieldset.mb3.p0.border-none
+    legend.mb1.h4.serif.bold = t('devise.two_factor_authentication.otp_delivery_preference.title')
+    label.btn-border.col-12.sm-col-5.sm-mr2.mb2.sm-mb0
+      .radio
+        = radio_button_tag 'otp_delivery_selection_form[otp_delivery_preference]', :sms, true,
+          class: :otp_delivery_preference_sms
+        span.indicator
+        = t('devise.two_factor_authentication.otp_delivery_preference.sms')
+    - if @set_otp_delivery_method_presenter.sms_only?
+      label.btn-border.col-12.sm-col-5.mb0.btn-disabled
+        .radio
+          = radio_button_tag 'otp_delivery_selection_form[otp_delivery_preference]', :voice, false,
+            disabled: true,
+            class: :otp_delivery_preference_voice
+          span.indicator
+          = t('devise.two_factor_authentication.otp_delivery_preference.voice')
+      p.mt2.mb0 = @set_otp_delivery_method_presenter.phone_unsupported_message
+    - else
+      label.btn-border.col-12.sm-col-5.mb0
+        .radio
+          = radio_button_tag 'otp_delivery_selection_form[otp_delivery_preference]', :voice, false,
+            class: :otp_delivery_preference_voice
+          span.indicator
+          = t('devise.two_factor_authentication.otp_delivery_preference.voice')
+  = f.submit t('idv.buttons.send_confirmation_code'), type: :submit, class: 'btn btn-primary'
+.mt2.pt1.border-top
+  = t('instructions.mfa.wrong_number_html',
+    link: link_to(t('forms.two_factor.try_again'), verify_phone_path))
diff --git a/app/views/verify/phone/new.html.slim b/app/views/verify/phone/new.html.slim
index 39dd10e522d..24cfe4bef20 100644
--- a/app/views/verify/phone/new.html.slim
+++ b/app/views/verify/phone/new.html.slim
@@ -1,5 +1,4 @@
 - title @view_model.title
-= render @view_model.mock_vendor_partial
 
 h1.h2.my0 = t('idv.titles.session.phone')
 p.mt-tiny.mb2 = t('idv.messages.phone.intro')
diff --git a/app/views/verify/sessions/_no_pii_warning.html.slim b/app/views/verify/sessions/_no_pii_warning.html.slim
deleted file mode 100644
index b05b9d379ca..00000000000
--- a/app/views/verify/sessions/_no_pii_warning.html.slim
+++ /dev/null
@@ -1 +0,0 @@
-.mt1.mb2.h6.caps.bold.red = t('idv.messages.sessions.no_pii')
diff --git a/app/views/verify/sessions/new.html.slim b/app/views/verify/sessions/new.html.slim
index 59fe0958e9c..4f18b4307bd 100644
--- a/app/views/verify/sessions/new.html.slim
+++ b/app/views/verify/sessions/new.html.slim
@@ -1,5 +1,4 @@
 - title @view_model.title
-= render @view_model.mock_vendor_partial
 
 h1.h3.my0 = @view_model.title
 = simple_form_for(@view_model.idv_form, url: verify_session_path,
diff --git a/bin/setup b/bin/setup
index bb38fe0124b..4851289229a 100755
--- a/bin/setup
+++ b/bin/setup
@@ -53,11 +53,13 @@ Dir.chdir APP_ROOT do
   run 'gem install foreman --conservative && gem update foreman'
   run "bundle check || bundle install"
   run "npm install"
+  run "npm run build"
+  run "gem install mailcatcher"
 
   puts "\n== Preparing database =="
-  run "bin/rake db:reset RAILS_ENV=development"
+  run 'bin/rake db:environment:set RAILS_ENV=development db:reset'
   run 'bin/rake dev:prime RAILS_ENV=development'
-  run 'bin/rake db:reset RAILS_ENV=test'
+  run 'bin/rake db:environment:set RAILS_ENV=test db:reset'
 
   puts "\n== Removing old logs and tempfiles =="
   run "rm -f log/*"
diff --git a/config/application.rb b/config/application.rb
index 91fbd99d570..ab977b40760 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -8,7 +8,6 @@
 module Upaya
   class Application < Rails::Application
     config.active_job.queue_adapter = :sidekiq
-    config.active_record.raise_in_transactional_callbacks = true
     config.autoload_paths << Rails.root.join('app', 'mailers', 'concerns')
     config.time_zone = 'UTC'
 
@@ -30,7 +29,7 @@ class Application < Rails::Application
       end
     end
 
-    config.middleware.insert_before 0, 'Rack::Cors' do
+    config.middleware.insert_before 0, Rack::Cors do
       allow do
         origins '*'
         resource '/.well-known/openid-configuration', headers: :any, methods: [:get]
diff --git a/config/environments/production.rb b/config/environments/production.rb
index db18fb995e8..b5e81fb00a3 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -1,7 +1,9 @@
 Rails.application.configure do
   config.cache_classes = true
   config.eager_load = true
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local = false
+  config.action_controller.asset_host = Figaro.env.domain_name
+  config.action_controller.default_url_options = { host: Figaro.env.domain_name }
   config.action_controller.perform_caching = true
   config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
   config.assets.js_compressor = :uglifier
diff --git a/config/environments/test.rb b/config/environments/test.rb
index e23d43c3c47..60aa4afb4b4 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -2,8 +2,8 @@
   config.active_job.queue_adapter = :test
   config.cache_classes = true
   config.eager_load = false
-  config.serve_static_files = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
   config.consider_all_requests_local = true
   config.action_controller.perform_caching = false
   config.action_dispatch.show_exceptions = false
diff --git a/config/initializers/saml_idp.rb b/config/initializers/saml_idp.rb
index 740bf16d982..96802a13e9e 100644
--- a/config/initializers/saml_idp.rb
+++ b/config/initializers/saml_idp.rb
@@ -4,7 +4,9 @@
   protocol = Rails.env.development? ? 'http://' : 'https://'
   api_base = protocol + Figaro.env.domain_name + '/api'
 
-  config.x509_certificate = File.read(Rails.root.join('certs', 'saml.crt'))
+  config.x509_certificate = OpenSSL::X509::Certificate.new(
+    File.read(Rails.root.join('certs', 'saml.crt'))
+  ).to_pem
   config.secret_key = RequestKeyManager.private_key.to_pem
 
   config.algorithm = OpenSSL::Digest::SHA256
diff --git a/config/initializers/session_limitable.rb b/config/initializers/session_limitable.rb
new file mode 100644
index 00000000000..d733212a125
--- /dev/null
+++ b/config/initializers/session_limitable.rb
@@ -0,0 +1,27 @@
+# After each sign in, update unique_session_id.
+# This is only triggered when the user is explicitly set (with set_user)
+# and on authentication. Retrieving the user from session (:fetch) does
+# not trigger it.
+Warden::Manager.after_set_user(except: :fetch) do |record, warden, options|
+  if warden.authenticated?(options[:scope])
+    unique_session_id = Devise.friendly_token
+    warden.session(options[:scope])['unique_session_id'] = unique_session_id
+    UpdateUser.new(user: record, attributes: { unique_session_id: unique_session_id }).call
+  end
+end
+
+# Each time a record is fetched from session we check if a new session from another
+# browser was opened for the record or not, based on a unique session identifier.
+# If so, the old account is logged out and redirected to the sign in page on the next request.
+Warden::Manager.after_set_user(only: :fetch) do |record, warden, options|
+  scope = options[:scope]
+  current_session_id = warden.session(scope)['unique_session_id']
+
+  if warden.authenticated?(scope) && options[:store] != false
+    if record.unique_session_id != current_session_id
+      warden.raw_session.clear
+      warden.logout(scope)
+      throw :warden, scope: scope, message: :session_limited
+    end
+  end
+end
diff --git a/config/initializers/teaspoon.rb b/config/initializers/teaspoon.rb
index 0b83b946243..fe334b60fc7 100644
--- a/config/initializers/teaspoon.rb
+++ b/config/initializers/teaspoon.rb
@@ -3,7 +3,7 @@
 
   module Teaspoon
     class SuiteController
-      skip_before_filter :handle_two_factor_authentication
+      skip_before_action :handle_two_factor_authentication
     end
   end
 end
diff --git a/config/locales/account/fr.yml b/config/locales/account/fr.yml
index 650827dd753..cf46ca235ce 100644
--- a/config/locales/account/fr.yml
+++ b/config/locales/account/fr.yml
@@ -17,7 +17,7 @@ fr:
         instructions: Votre profil a été récemment désactivé en raison d'une réinitialisation
           de mot passe. Vous pouvez utiliser votre clé personnelle pour réactiver
           votre profil.
-        link: NOT TRANSLATED YET
+        link: Réactivez votre profil maintenant.
       ssn: Numéro d'assurance sociale
       verification:
         instructions: Votre compte requiert la vérification d'un code secret.
diff --git a/config/locales/devise/fr.yml b/config/locales/devise/fr.yml
index 983a01465bd..11235078bcb 100644
--- a/config/locales/devise/fr.yml
+++ b/config/locales/devise/fr.yml
@@ -114,7 +114,8 @@ fr:
       max_otp_login_attempts_reached: Votre compte est temporairement verrouillé,
         car vous avez entré le code de sécurité à utilisation unique de façon erronée
         à de trop nombreuses reprises.
-      max_otp_requests_reached: NOT TRANSLATED YET
+      max_otp_requests_reached: Votre compte est temporairement verrouillé car vous
+        avez demandé un code de sécurité à trop de reprises.
       max_personal_key_login_attempts_reached: Votre compte est temporairement verrouillé,
         car vous avez entré le code de sécurité à utilisation unique de façon erronée
         à de trop nombreuses reprises.
diff --git a/config/locales/errors/en.yml b/config/locales/errors/en.yml
index 13d14c83684..59c06c8edaa 100644
--- a/config/locales/errors/en.yml
+++ b/config/locales/errors/en.yml
@@ -35,5 +35,7 @@ en:
       requires_phone: requires you to enter your phone number.
       unauthorized_authn_context: Unauthorized authentication context
       unauthorized_service_provider: Unauthorized Service Provider
+      usps_otp_expired: Your confirmation code has expired. Please request another
+        letter for a new code.
       weak_password: Your password is not strong enough. %{feedback}
     not_authorized: You are not authorized to perform this action.
diff --git a/config/locales/errors/es.yml b/config/locales/errors/es.yml
index aaf5b701dfa..1b2465a75f9 100644
--- a/config/locales/errors/es.yml
+++ b/config/locales/errors/es.yml
@@ -33,5 +33,6 @@ es:
       requires_phone: requiere que ingrese su número de teléfono.
       unauthorized_authn_context: Contexto de autenticación no autorizado
       unauthorized_service_provider: Proveedor de servicio no autorizado
+      usps_otp_expired: NOT TRANSLATED YET
       weak_password: Su contraseña no es suficientemente segura. %{feedback}
     not_authorized: No está autorizado para realizar esta acción.
diff --git a/config/locales/errors/fr.yml b/config/locales/errors/fr.yml
index 5ce5df6cfc5..1d23dfeea64 100644
--- a/config/locales/errors/fr.yml
+++ b/config/locales/errors/fr.yml
@@ -36,5 +36,6 @@ fr:
       requires_phone: vous demande d'entrer votre numéro de téléphone.
       unauthorized_authn_context: Contexte d'authentification non autorisé
       unauthorized_service_provider: Fournisseur de service non autorisé
+      usps_otp_expired: NOT TRANSLATED YET
       weak_password: Votre mot de passe n'est pas assez fort. %{feedback}
     not_authorized: Vous n'êtes pas autorisé(e) à effectuer cette action.
diff --git a/config/locales/forms/fr.yml b/config/locales/forms/fr.yml
index fe721ae4650..236e9e9b942 100644
--- a/config/locales/forms/fr.yml
+++ b/config/locales/forms/fr.yml
@@ -23,7 +23,7 @@ fr:
           password: Nouveau mot de passe
       show: Afficher le mot de passe
     personal_key:
-      alternative: NOT TRANSLATED YET
+      alternative: Vous n'avez pas votre clé personnelle?
       confirmation_label: Clé personnelle
       instructions: Veuillez confirmer que vous avez une copie de votre clé personnelle
         en l'entrant ci-dessous.
diff --git a/config/locales/headings/fr.yml b/config/locales/headings/fr.yml
index 226fd4fedd5..0ec945da854 100644
--- a/config/locales/headings/fr.yml
+++ b/config/locales/headings/fr.yml
@@ -5,7 +5,7 @@ fr:
       account_history: Historique du compte
       login_info: Votre compte
       profile_info: Information du profil
-      reactivate: NOT TRANSLATED YET
+      reactivate: Réactivez votre compte
       two_factor: Authentification à deux facteurs
       verified_account: Compte vérifié
     confirmations:
diff --git a/config/locales/idv/en.yml b/config/locales/idv/en.yml
index b413ebc3505..cc820cbd789 100644
--- a/config/locales/idv/en.yml
+++ b/config/locales/idv/en.yml
@@ -12,6 +12,7 @@ en:
         send: Send a letter
       return_to_account: Return to account
       return_to_sp: Return to %{sp}
+      send_confirmation_code: Send confirmation code
     cancel:
       modal_header: Are you sure you want to cancel?
       warning_header: If you cancel now
@@ -126,6 +127,8 @@ en:
       help_center: Visit our Help Center to learn more about verifying your account.
       loading: Verifying your identity
       mail_sent: Your letter is on its way
+      otp_delivery_method:
+        phone_number_html: We will send a code to <strong>%{phone}</strong>
       personal_details_verified: Personal details verified!
       personal_key: This is your new personal key. Write it down and keep it in a
         safe place. You will need it if you ever lose your password.
@@ -205,6 +208,7 @@ en:
       mail:
         resend: Want another letter?
         verify: Want a letter?
+      otp_delivery_method: Get a code by phone
       phone: Phone number of record
       review: Review and submit
       select_verification: Activate your account
diff --git a/config/locales/idv/es.yml b/config/locales/idv/es.yml
index b21a8e6f7a4..6c0226d64e4 100644
--- a/config/locales/idv/es.yml
+++ b/config/locales/idv/es.yml
@@ -12,6 +12,7 @@ es:
         send: Enviar una carta
       return_to_account: NOT TRANSLATED YET
       return_to_sp: NOT TRANSLATED YET
+      send_confirmation_code: NOT TRANSLATED YET
     cancel:
       modal_header: "¿Está seguro que desea cancelar?"
       warning_header: Si usted cancela ahora
@@ -128,6 +129,8 @@ es:
         la verificación de su cuenta.
       loading: NOT TRANSLATED YET
       mail_sent: Su carta está en camino
+      otp_delivery_method:
+        phone_number_html: NOT TRANSLATED YET
       personal_details_verified: "¡Detalles personales verificados!"
       personal_key: Esta es su nueva clave personal. Escríbala y guárdela en un lugar
         seguro. La necesitará si pierde su contraseña.
@@ -211,6 +214,7 @@ es:
       mail:
         resend: "¿Desea otra carta?"
         verify: "¿Desea una carta?"
+      otp_delivery_method: NOT TRANSLATED YET
       phone: Número de teléfono del registro
       review: Revise y envíe
       select_verification: Active su cuenta
diff --git a/config/locales/idv/fr.yml b/config/locales/idv/fr.yml
index 923da86d2c8..01ac0d13123 100644
--- a/config/locales/idv/fr.yml
+++ b/config/locales/idv/fr.yml
@@ -12,6 +12,7 @@ fr:
         send: Envoyer une lettre
       return_to_account: NOT TRANSLATED YET
       return_to_sp: NOT TRANSLATED YET
+      send_confirmation_code: NOT TRANSLATED YET
     cancel:
       modal_header: Souhaitez-vous vraiment annuler?
       warning_header: Si vous annulez maintenant
@@ -136,6 +137,8 @@ fr:
         façon dont nous vérifions votre compte.
       loading: NOT TRANSLATED YET
       mail_sent: Votre lettre est en route
+      otp_delivery_method:
+        phone_number_html: NOT TRANSLATED YET
       personal_details_verified: Information personnelle vérifiée!
       personal_key: Il s'agit de votre nouvelle clé personnelle. Notez-la et conservez-la
         dans un endroit sécuritaire. Vous en aurez besoin si vous perdez votre mot
@@ -223,6 +226,7 @@ fr:
       mail:
         resend: Vous voulez une autre lettre?
         verify: Vous voulez une lettre?
+      otp_delivery_method: NOT TRANSLATED YET
       phone: Numéro de téléphone enregistré
       review: Réviser et soumettre
       select_verification: Activer votre compte
diff --git a/config/locales/instructions/fr.yml b/config/locales/instructions/fr.yml
index cad7c6b45d4..6ce66cfee14 100644
--- a/config/locales/instructions/fr.yml
+++ b/config/locales/instructions/fr.yml
@@ -3,17 +3,23 @@ fr:
   instructions:
     account:
       reactivate:
-        begin: NOT TRANSLATED YET
-        explanation: NOT TRANSLATED YET
-        intro: NOT TRANSLATED YET
+        begin: Démarrons.
+        explanation: 'Lorsque vous avez créé votre compte, nous vous avons donné une
+          liste de mots et vous avons demandé de les placer en lieu sûr. La liste
+          était similaire à ceci:'
+        intro: Nous en faisons un peu plus pour garder votre information sécurisée
+          et confidentielle, alors réinitialiser votre mot de passe demande un peu
+          plus d'effort.
         modal:
-          copy: NOT TRANSLATED YET
-          heading: NOT TRANSLATED YET
-        with_key: NOT TRANSLATED YET
+          copy: Si vous n'avez pas votre clé personnelle, vous devrez vérifier votre
+            identité de nouveau.
+          heading: Vous n'avez pas votre clé personnelle?
+        with_key: Vous n'avez pas votre clé personnelle?
     forgot_password:
       close_window: Vous pourrez fermer cette fenêtre de navigateur lorsque vous aurez
         réinitialisé votre mot de passe.
-    go_back_to_mobile_app: NOT TRANSLATED YET
+    go_back_to_mobile_app: Pour continuer, veuillez retourner à l'application %{friendly_name}
+      et vous connecter.
     mfa:
       authenticator:
         accordion_header: Balayez le code avec votre appareil mobile
diff --git a/config/locales/jobs/fr.yml b/config/locales/jobs/fr.yml
index fe6a39446d9..bb76630ae82 100644
--- a/config/locales/jobs/fr.yml
+++ b/config/locales/jobs/fr.yml
@@ -2,7 +2,7 @@
 fr:
   jobs:
     sms_otp_sender_job:
-      message: "%{code} est votre code de sécurité à utilisation unique pour %{app}"
+      message: "%{code} est votre %{app} code de sécurité à utilisation unique."
     voice_otp_sender_job:
       message_final: Bonjour! Votre code de sécurité à utilisation unique de login.gov
         est, %{code}, de nouveau, votre code de sécurité est, %{code}, au revoir!
diff --git a/config/locales/links/fr.yml b/config/locales/links/fr.yml
index 16dc81e3b81..a30b45fdb33 100644
--- a/config/locales/links/fr.yml
+++ b/config/locales/links/fr.yml
@@ -3,8 +3,8 @@ fr:
   links:
     account:
       reactivate:
-        with_key: NOT TRANSLATED YET
-        without_key: NOT TRANSLATED YET
+        with_key: J'ai ma clé
+        without_key: Je n'ai pas ma clé
     back_to_sp: Retour à %{sp}
     cancel: Annuler
     cancel_account_creation: "‹ Annuler la création du compte"
@@ -24,7 +24,7 @@ fr:
     privacy_policy: Confidentialité et sécurité
     remove: Retirer
     resend: Envoyer le courriel de nouveau
-    reverify: NOT TRANSLATED YET
+    reverify: Veuillez vérifier votre identité de nouveau.
     sign_in: Connexion
     sign_out: Déconnexion
     two_factor_authentication:
diff --git a/config/locales/notices/fr.yml b/config/locales/notices/fr.yml
index 3317236e881..9c44b4c2d91 100644
--- a/config/locales/notices/fr.yml
+++ b/config/locales/notices/fr.yml
@@ -1,7 +1,7 @@
 ---
 fr:
   notices:
-    account_reactivation: NOT TRANSLATED YET
+    account_reactivation: Excellent! Vous avez votre clé personnelle.
     dap_participation: Nous participons au programme d'analytique du gouvernement
       des États-Unis. Consultez les données à analytics.usa.gov.
     forgot_password:
diff --git a/config/routes.rb b/config/routes.rb
index 6797eb73f30..e9b9f0f53b4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -134,6 +134,8 @@
       put '/verify/finance' => 'verify/finance#create'
       get '/verify/finance/other' => 'verify/finance_other#new'
       get '/verify/finance/result' => 'verify/finance#show'
+      get '/verify/otp_delivery_method' => 'verify/otp_delivery_method#new'
+      put '/verify/otp_delivery_method' => 'verify/otp_delivery_method#create'
       get '/verify/phone' => 'verify/phone#new'
       put '/verify/phone' => 'verify/phone#create'
       get '/verify/phone/result' => 'verify/phone#show'
@@ -161,7 +163,5 @@
   # The line below will route all requests that aren't
   # defined route to the 404 page. Therefore, anything you put after this rule
   # will be ignored.
-  constraints(format: /html/) do
-    match '*path', via: :all, to: 'pages#page_not_found'
-  end
+  match '*path', via: :all, to: 'pages#page_not_found'
 end
diff --git a/docker-compose.yml b/docker-compose.yml
index dd411840851..b875a0d005d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,6 +30,7 @@ services:
   redis:
     image: redis
   mailcatcher:
-    image: yappabe/mailcatcher
+    image: rordi/docker-mailcatcher
+    container_name: mailcatcher
     ports:
       - 1080:1080
diff --git a/lib/yaml_normalizer.rb b/lib/yaml_normalizer.rb
index 347a0421ebd..6802517df2d 100644
--- a/lib/yaml_normalizer.rb
+++ b/lib/yaml_normalizer.rb
@@ -7,29 +7,35 @@ def self.run(argv)
     argv.each do |file|
       $stderr.puts file
       data = YAML.load_file(file)
-      chomp_each(data)
+      handle_hash(data)
       dump(file, data)
     end
   end
 
-  def self.chomp_each(hash)
+  def self.dump(file, data)
+    File.open(file, 'w') { |io| io.puts YAML.dump(data) }
+  end
+
+  def self.handle_hash(hash)
     hash.each do |_key, value|
-      if value.is_a?(String)
-        trim(value)
-      elsif value.is_a?(Array)
-        strip_array(value)
-      elsif value
-        chomp_each(value)
-      end
+      handle_value(value)
     end
   end
 
-  def self.dump(file, data)
-    File.open(file, 'w') { |io| io.puts YAML.dump(data) }
+  def self.handle_array(array)
+    array.each { |value| handle_value(value) }
   end
 
-  def self.strip_array(value)
-    value.each { |str| trim(str) if str }
+  def self.handle_value(value)
+    if value.is_a?(String)
+      trim(value)
+    elsif value.is_a?(Array)
+      handle_array(value)
+    elsif value.kind_of?(Hash)
+      handle_hash(value)
+    elsif value
+      raise ArgumentError, "unknown YAML value #{value}"
+    end
   end
 
   def self.trim(str)
diff --git a/package-lock.json b/package-lock.json
index 1571492561e..0b61dd1c636 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,6 +2,7 @@
   "name": "upaya",
   "version": "0.0.1",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
     "acorn": {
       "version": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
@@ -12,6 +13,9 @@
       "version": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
       "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
       "dev": true,
+      "requires": {
+        "acorn": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"
+      },
       "dependencies": {
         "acorn": {
           "version": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
@@ -24,11 +28,18 @@
       "version": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
       "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
       "dev": true,
+      "requires": {
+        "co": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+        "json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
+      },
       "dependencies": {
         "json-stable-stringify": {
           "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
           "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+          }
         }
       }
     },
@@ -61,17 +72,35 @@
     "app": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/app/-/app-0.1.0.tgz",
-      "integrity": "sha1-eT4S9R98zgkiwjFlJhVDeGp0f+o="
+      "integrity": "sha1-eT4S9R98zgkiwjFlJhVDeGp0f+o=",
+      "requires": {
+        "app-client": "0.1.0",
+        "connect": "3.6.2",
+        "cornerstone": "0.1.1",
+        "mime": "1.3.6",
+        "mongoose": "4.11.3",
+        "optimist": "0.6.1",
+        "uglify-js": "3.0.25"
+      }
     },
     "app-client": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/app-client/-/app-client-0.1.0.tgz",
-      "integrity": "sha1-K1pOexcCqmX92MnOZoN4o1hgcJ0="
+      "integrity": "sha1-K1pOexcCqmX92MnOZoN4o1hgcJ0=",
+      "requires": {
+        "connect": "3.6.2",
+        "cornerstone": "0.1.1",
+        "modulator": "0.1.0",
+        "optimist": "0.6.1"
+      }
     },
     "argparse": {
       "version": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
       "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "sprintf-js": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+      }
     },
     "array-filter": {
       "version": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
@@ -91,7 +120,10 @@
     "array-union": {
       "version": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
       "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "array-uniq": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
+      }
     },
     "array-uniq": {
       "version": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
@@ -106,12 +138,20 @@
     "asn1.js": {
       "version": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
       "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "minimalistic-assert": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+      }
     },
     "assert": {
       "version": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
       "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "util": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+      }
     },
     "assertion-error": {
       "version": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
@@ -121,7 +161,10 @@
     "astw": {
       "version": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz",
       "integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "acorn": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
+      }
     },
     "async": {
       "version": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -131,22 +174,64 @@
     "babel-code-frame": {
       "version": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
       "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+        "esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+        "js-tokens": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
+      }
     },
     "babel-core": {
       "version": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
       "integrity": "sha1-jEKFZNzh4fQfszfsNPTDsCK1rYM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+        "babel-generator": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz",
+        "babel-helpers": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
+        "babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+        "babel-register": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz",
+        "convert-source-map": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz",
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "json5": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+        "private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz",
+        "slash": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+      }
     },
     "babel-eslint": {
       "version": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz",
       "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz"
+      }
     },
     "babel-generator": {
       "version": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.24.1.tgz",
       "integrity": "sha1-5xX0hsWN7SVknYiJRNUqoHxdlJc=",
       "dev": true,
+      "requires": {
+        "babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "detect-indent": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
+        "jsesc": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+        "trim-right": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz"
+      },
       "dependencies": {
         "jsesc": {
           "version": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
@@ -158,212 +243,441 @@
     "babel-helper-call-delegate": {
       "version": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
       "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-helper-define-map": {
       "version": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
       "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+      }
     },
     "babel-helper-function-name": {
       "version": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
       "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-get-function-arity": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-helper-get-function-arity": {
       "version": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
       "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-helper-hoist-variables": {
       "version": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
       "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-helper-optimise-call-expression": {
       "version": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
       "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-helper-regex": {
       "version": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
       "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+      }
     },
     "babel-helper-replace-supers": {
       "version": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
       "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-optimise-call-expression": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+        "babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-helpers": {
       "version": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
       "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+      }
     },
     "babel-messages": {
       "version": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
       "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-check-es2015-constants": {
       "version": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
       "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-arrow-functions": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
       "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-block-scoped-functions": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
       "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-block-scoping": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
       "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+      }
     },
     "babel-plugin-transform-es2015-classes": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
       "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-define-map": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz",
+        "babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+        "babel-helper-optimise-call-expression": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
+        "babel-helper-replace-supers": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+        "babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-computed-properties": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
       "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-destructuring": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
       "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-duplicate-keys": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
       "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-for-of": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
       "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-function-name": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
       "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-function-name": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-literals": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
       "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-modules-amd": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
       "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-commonjs": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-modules-commonjs": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
       "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-strict-mode": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-modules-systemjs": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
       "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-hoist-variables": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-modules-umd": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
       "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-plugin-transform-es2015-modules-amd": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-object-super": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
       "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-replace-supers": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-parameters": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
       "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-call-delegate": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
+        "babel-helper-get-function-arity": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-template": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-shorthand-properties": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
       "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-spread": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
       "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-sticky-regex": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
       "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-plugin-transform-es2015-template-literals": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
       "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-typeof-symbol": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
       "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz"
+      }
     },
     "babel-plugin-transform-es2015-unicode-regex": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
       "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-helper-regex": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "regexpu-core": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"
+      }
     },
     "babel-plugin-transform-regenerator": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz",
       "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "regenerator-transform": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz"
+      }
     },
     "babel-plugin-transform-strict-mode": {
       "version": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
       "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz"
+      }
     },
     "babel-preset-es2015": {
       "version": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-plugin-check-es2015-constants": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
+        "babel-plugin-transform-es2015-arrow-functions": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
+        "babel-plugin-transform-es2015-block-scoped-functions": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
+        "babel-plugin-transform-es2015-block-scoping": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz",
+        "babel-plugin-transform-es2015-classes": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
+        "babel-plugin-transform-es2015-computed-properties": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
+        "babel-plugin-transform-es2015-destructuring": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
+        "babel-plugin-transform-es2015-duplicate-keys": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
+        "babel-plugin-transform-es2015-for-of": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
+        "babel-plugin-transform-es2015-function-name": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
+        "babel-plugin-transform-es2015-literals": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
+        "babel-plugin-transform-es2015-modules-amd": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
+        "babel-plugin-transform-es2015-modules-commonjs": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz",
+        "babel-plugin-transform-es2015-modules-systemjs": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
+        "babel-plugin-transform-es2015-modules-umd": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
+        "babel-plugin-transform-es2015-object-super": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
+        "babel-plugin-transform-es2015-parameters": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
+        "babel-plugin-transform-es2015-shorthand-properties": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
+        "babel-plugin-transform-es2015-spread": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
+        "babel-plugin-transform-es2015-sticky-regex": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
+        "babel-plugin-transform-es2015-template-literals": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
+        "babel-plugin-transform-es2015-typeof-symbol": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
+        "babel-plugin-transform-es2015-unicode-regex": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
+        "babel-plugin-transform-regenerator": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz"
+      }
     },
     "babel-register": {
       "version": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz",
       "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "core-js": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+        "home-or-tmp": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+        "source-map-support": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz"
+      }
     },
     "babel-runtime": {
       "version": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
       "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=",
-      "dev": true
+      "requires": {
+        "core-js": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
+        "regenerator-runtime": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"
+      }
     },
     "babel-template": {
       "version": "https://registry.npmjs.org/babel-template/-/babel-template-6.24.1.tgz",
       "integrity": "sha1-BK5RTx+Ts6JTfyoPYKWkX7gwgzM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-traverse": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+      }
     },
     "babel-traverse": {
       "version": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.24.1.tgz",
       "integrity": "sha1-qzZnP9NW+aCUhlnnszjV/q2zFpU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+        "babel-messages": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "babylon": "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz",
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "globals": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
+        "invariant": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+      }
     },
     "babel-types": {
       "version": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
       "integrity": "sha1-oTaHncFbNga9oNkMH8dDBML/CXU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "to-fast-properties": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz"
+      }
     },
     "babelify": {
       "version": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz",
       "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-core": "https://registry.npmjs.org/babel-core/-/babel-core-6.24.1.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+      }
     },
     "babylon": {
       "version": "https://registry.npmjs.org/babylon/-/babylon-6.17.2.tgz",
@@ -382,7 +696,36 @@
     },
     "basscss": {
       "version": "https://registry.npmjs.org/basscss/-/basscss-7.1.1.tgz",
-      "integrity": "sha1-e/MSAxl6Kd8O7lUfQlYXqL58d3s="
+      "integrity": "sha1-e/MSAxl6Kd8O7lUfQlYXqL58d3s=",
+      "requires": {
+        "basscss-align": "https://registry.npmjs.org/basscss-align/-/basscss-align-1.0.2.tgz",
+        "basscss-background-colors": "https://registry.npmjs.org/basscss-background-colors/-/basscss-background-colors-1.1.3.tgz",
+        "basscss-base-forms": "https://registry.npmjs.org/basscss-base-forms/-/basscss-base-forms-2.0.2.tgz",
+        "basscss-base-reset": "https://registry.npmjs.org/basscss-base-reset/-/basscss-base-reset-2.0.3.tgz",
+        "basscss-base-tables": "https://registry.npmjs.org/basscss-base-tables/-/basscss-base-tables-1.0.2.tgz",
+        "basscss-base-typography": "https://registry.npmjs.org/basscss-base-typography/-/basscss-base-typography-2.0.3.tgz",
+        "basscss-border": "https://registry.npmjs.org/basscss-border/-/basscss-border-3.0.4.tgz",
+        "basscss-border-colors": "https://registry.npmjs.org/basscss-border-colors/-/basscss-border-colors-1.1.3.tgz",
+        "basscss-borders": "https://registry.npmjs.org/basscss-borders/-/basscss-borders-2.0.5.tgz",
+        "basscss-btn": "https://registry.npmjs.org/basscss-btn/-/basscss-btn-1.1.1.tgz",
+        "basscss-btn-outline": "https://registry.npmjs.org/basscss-btn-outline/-/basscss-btn-outline-1.1.0.tgz",
+        "basscss-btn-primary": "https://registry.npmjs.org/basscss-btn-primary/-/basscss-btn-primary-1.1.0.tgz",
+        "basscss-color-base": "https://registry.npmjs.org/basscss-color-base/-/basscss-color-base-2.0.2.tgz",
+        "basscss-color-forms": "https://registry.npmjs.org/basscss-color-forms/-/basscss-color-forms-3.0.2.tgz",
+        "basscss-color-tables": "https://registry.npmjs.org/basscss-color-tables/-/basscss-color-tables-1.0.4.tgz",
+        "basscss-colors": "https://registry.npmjs.org/basscss-colors/-/basscss-colors-2.2.0.tgz",
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz",
+        "basscss-grid": "https://registry.npmjs.org/basscss-grid/-/basscss-grid-1.0.6.tgz",
+        "basscss-layout": "https://registry.npmjs.org/basscss-layout/-/basscss-layout-3.1.0.tgz",
+        "basscss-margin": "https://registry.npmjs.org/basscss-margin/-/basscss-margin-1.0.7.tgz",
+        "basscss-padding": "https://registry.npmjs.org/basscss-padding/-/basscss-padding-1.1.3.tgz",
+        "basscss-position": "https://registry.npmjs.org/basscss-position/-/basscss-position-2.0.3.tgz",
+        "basscss-positions": "https://registry.npmjs.org/basscss-positions/-/basscss-positions-1.0.5.tgz",
+        "basscss-responsive-states": "https://registry.npmjs.org/basscss-responsive-states/-/basscss-responsive-states-1.0.6.tgz",
+        "basscss-type-scale": "https://registry.npmjs.org/basscss-type-scale/-/basscss-type-scale-1.0.5.tgz",
+        "basscss-typography": "https://registry.npmjs.org/basscss-typography/-/basscss-typography-3.0.3.tgz",
+        "flex-object": "https://registry.npmjs.org/flex-object/-/flex-object-2.0.5.tgz"
+      }
     },
     "basscss-align": {
       "version": "https://registry.npmjs.org/basscss-align/-/basscss-align-1.0.2.tgz",
@@ -390,11 +733,17 @@
     },
     "basscss-background-colors": {
       "version": "https://registry.npmjs.org/basscss-background-colors/-/basscss-background-colors-1.1.3.tgz",
-      "integrity": "sha1-VKKDZRxAklZTJKTvW8JdcL52IdY="
+      "integrity": "sha1-VKKDZRxAklZTJKTvW8JdcL52IdY=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-base-forms": {
       "version": "https://registry.npmjs.org/basscss-base-forms/-/basscss-base-forms-2.0.2.tgz",
-      "integrity": "sha1-Fgi5n/SG3WuJEZLKjSXi7VdYWao="
+      "integrity": "sha1-Fgi5n/SG3WuJEZLKjSXi7VdYWao=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-base-reset": {
       "version": "https://registry.npmjs.org/basscss-base-reset/-/basscss-base-reset-2.0.3.tgz",
@@ -402,23 +751,38 @@
     },
     "basscss-base-tables": {
       "version": "https://registry.npmjs.org/basscss-base-tables/-/basscss-base-tables-1.0.2.tgz",
-      "integrity": "sha1-uFDqHWSwb5GSK/z0AUuqoINquzA="
+      "integrity": "sha1-uFDqHWSwb5GSK/z0AUuqoINquzA=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-base-typography": {
       "version": "https://registry.npmjs.org/basscss-base-typography/-/basscss-base-typography-2.0.3.tgz",
-      "integrity": "sha1-H0vzRXEkgoII9oa8OFzTMK5+enI="
+      "integrity": "sha1-H0vzRXEkgoII9oa8OFzTMK5+enI=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-border": {
       "version": "https://registry.npmjs.org/basscss-border/-/basscss-border-3.0.4.tgz",
-      "integrity": "sha1-ZZk1aNoIZ+t12Wtwn5fjOyuQJIY="
+      "integrity": "sha1-ZZk1aNoIZ+t12Wtwn5fjOyuQJIY=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-border-colors": {
       "version": "https://registry.npmjs.org/basscss-border-colors/-/basscss-border-colors-1.1.3.tgz",
-      "integrity": "sha1-nrIya0eeqpe/m9bE7rwf2CTYCf4="
+      "integrity": "sha1-nrIya0eeqpe/m9bE7rwf2CTYCf4=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-borders": {
       "version": "https://registry.npmjs.org/basscss-borders/-/basscss-borders-2.0.5.tgz",
-      "integrity": "sha1-PYRw+6kOzoknBeGlskwna3Oe644="
+      "integrity": "sha1-PYRw+6kOzoknBeGlskwna3Oe644=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-btn": {
       "version": "https://registry.npmjs.org/basscss-btn/-/basscss-btn-1.1.1.tgz",
@@ -434,19 +798,31 @@
     },
     "basscss-color-base": {
       "version": "https://registry.npmjs.org/basscss-color-base/-/basscss-color-base-2.0.2.tgz",
-      "integrity": "sha1-7YSL/OORq1NabRSnAqFPpMTzJC0="
+      "integrity": "sha1-7YSL/OORq1NabRSnAqFPpMTzJC0=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-color-forms": {
       "version": "https://registry.npmjs.org/basscss-color-forms/-/basscss-color-forms-3.0.2.tgz",
-      "integrity": "sha1-jy0dB9X8tmRVbNNUvvmM67LV4Ms="
+      "integrity": "sha1-jy0dB9X8tmRVbNNUvvmM67LV4Ms=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-color-tables": {
       "version": "https://registry.npmjs.org/basscss-color-tables/-/basscss-color-tables-1.0.4.tgz",
-      "integrity": "sha1-1DXsfF8hD6F959G4gT3rvKalQ+E="
+      "integrity": "sha1-1DXsfF8hD6F959G4gT3rvKalQ+E=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-colors": {
       "version": "https://registry.npmjs.org/basscss-colors/-/basscss-colors-2.2.0.tgz",
       "integrity": "sha1-3Mt3Picu/kXfSkgJYsi9iLams+E=",
+      "requires": {
+        "colors.css": "https://registry.npmjs.org/colors.css/-/colors.css-3.0.0.tgz"
+      },
       "dependencies": {
         "colors.css": {
           "version": "https://registry.npmjs.org/colors.css/-/colors.css-3.0.0.tgz",
@@ -456,11 +832,17 @@
     },
     "basscss-defaults": {
       "version": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz",
-      "integrity": "sha1-tOpjToFcaSPwx2ZbFIpMyLO0OSc="
+      "integrity": "sha1-tOpjToFcaSPwx2ZbFIpMyLO0OSc=",
+      "requires": {
+        "colors.css": "https://registry.npmjs.org/colors.css/-/colors.css-2.3.0.tgz"
+      }
     },
     "basscss-grid": {
       "version": "https://registry.npmjs.org/basscss-grid/-/basscss-grid-1.0.6.tgz",
-      "integrity": "sha1-GlEsc7h0MwXkejanQyqtXCbMKGc="
+      "integrity": "sha1-GlEsc7h0MwXkejanQyqtXCbMKGc=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-layout": {
       "version": "https://registry.npmjs.org/basscss-layout/-/basscss-layout-3.1.0.tgz",
@@ -484,11 +866,17 @@
     },
     "basscss-responsive-states": {
       "version": "https://registry.npmjs.org/basscss-responsive-states/-/basscss-responsive-states-1.0.6.tgz",
-      "integrity": "sha1-2JI0PheZiFwD5PHHAs18GrUo8AI="
+      "integrity": "sha1-2JI0PheZiFwD5PHHAs18GrUo8AI=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "basscss-sass": {
       "version": "https://registry.npmjs.org/basscss-sass/-/basscss-sass-3.0.0.tgz",
-      "integrity": "sha1-nxvoX6jqafmUQVN2ImjEavMLxM0="
+      "integrity": "sha1-nxvoX6jqafmUQVN2ImjEavMLxM0=",
+      "requires": {
+        "basscss": "https://registry.npmjs.org/basscss/-/basscss-7.1.1.tgz"
+      }
     },
     "basscss-type-scale": {
       "version": "https://registry.npmjs.org/basscss-type-scale/-/basscss-type-scale-1.0.5.tgz",
@@ -511,7 +899,11 @@
     "brace-expansion": {
       "version": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz",
       "integrity": "sha1-Pv/DxQ4ABTH7cg6v+A8K6O8jz1k=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "balanced-match": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+        "concat-map": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+      }
     },
     "brorand": {
       "version": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
@@ -521,12 +913,22 @@
     "browser-pack": {
       "version": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz",
       "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "combine-source-map": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
+        "defined": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+        "JSONStream": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+        "umd": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"
+      }
     },
     "browser-resolve": {
       "version": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
       "integrity": "sha1-j/CbCixCFxihBRwmCzLkj0QpOM4=",
       "dev": true,
+      "requires": {
+        "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
+      },
       "dependencies": {
         "resolve": {
           "version": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
@@ -538,32 +940,109 @@
     "browserify": {
       "version": "https://registry.npmjs.org/browserify/-/browserify-13.3.0.tgz",
       "integrity": "sha1-tanJAgJD8McORnW+yCI7xifkFc4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "assert": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+        "browser-pack": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz",
+        "browser-resolve": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
+        "browserify-zlib": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+        "buffer": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
+        "cached-path-relative": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
+        "concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
+        "console-browserify": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+        "constants-browserify": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+        "crypto-browserify": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
+        "defined": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+        "deps-sort": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
+        "domain-browser": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
+        "duplexer2": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+        "events": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+        "has": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+        "htmlescape": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz",
+        "https-browserify": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "insert-module-globals": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz",
+        "JSONStream": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+        "labeled-stream-splicer": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
+        "module-deps": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
+        "os-browserify": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
+        "parents": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+        "path-browserify": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+        "process": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+        "punycode": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+        "querystring-es3": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+        "read-only-stream": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
+        "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+        "shasum": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+        "shell-quote": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
+        "stream-browserify": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
+        "stream-http": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz",
+        "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+        "subarg": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+        "syntax-error": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+        "timers-browserify": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+        "tty-browserify": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+        "url": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+        "util": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+        "vm-browserify": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "browserify-aes": {
       "version": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
       "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "buffer-xor": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+        "cipher-base": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz",
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "evp_bytestokey": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "browserify-cache-api": {
       "version": "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz",
       "integrity": "sha1-liR+hT8Gj9bg1FzHPwuyzZd47wI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "async": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "browserify-cipher": {
       "version": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
       "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "browserify-aes": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
+        "browserify-des": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
+        "evp_bytestokey": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
+      }
     },
     "browserify-des": {
       "version": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz",
       "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "cipher-base": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz",
+        "des.js": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "browserify-incremental": {
       "version": "https://registry.npmjs.org/browserify-incremental/-/browserify-incremental-3.1.1.tgz",
       "integrity": "sha1-BxPLdYckemMqnwjPG9FpuHi2Koo=",
       "dev": true,
+      "requires": {
+        "browserify-cache-api": "https://registry.npmjs.org/browserify-cache-api/-/browserify-cache-api-3.0.1.tgz",
+        "JSONStream": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      },
       "dependencies": {
         "jsonparse": {
           "version": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
@@ -573,24 +1052,44 @@
         "JSONStream": {
           "version": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz",
           "integrity": "sha1-dDSdDYlSK3HzDwoD/5vSDKbxKsA=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "jsonparse": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz",
+            "through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+          }
         }
       }
     },
     "browserify-rsa": {
       "version": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
       "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "randombytes": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz"
+      }
     },
     "browserify-sign": {
       "version": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
       "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "browserify-rsa": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "create-hmac": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
+        "elliptic": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "parse-asn1": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz"
+      }
     },
     "browserify-zlib": {
       "version": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
       "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "pako": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"
+      }
     },
     "bson": {
       "version": "1.0.4",
@@ -600,7 +1099,12 @@
     "buffer": {
       "version": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "base64-js": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz",
+        "ieee754": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+      }
     },
     "buffer-shims": {
       "version": "1.0.0",
@@ -630,7 +1134,10 @@
     "caller-path": {
       "version": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
       "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "callsites": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"
+      }
     },
     "callsites": {
       "version": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz",
@@ -640,17 +1147,32 @@
     "chai": {
       "version": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz",
       "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "assertion-error": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz",
+        "deep-eql": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
+        "type-detect": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz"
+      }
     },
     "chalk": {
       "version": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
       "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "ansi-styles": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+        "escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+        "has-ansi": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+        "supports-color": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+      }
     },
     "cipher-base": {
       "version": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz",
       "integrity": "sha1-7qvxlEGc6QDaMBjCB9IS8qbfCgc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "circular-json": {
       "version": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
@@ -664,7 +1186,10 @@
     "cli-cursor": {
       "version": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
       "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "restore-cursor": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"
+      }
     },
     "cli-width": {
       "version": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
@@ -673,7 +1198,12 @@
     },
     "clipboard": {
       "version": "https://registry.npmjs.org/clipboard/-/clipboard-1.7.1.tgz",
-      "integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs="
+      "integrity": "sha1-Ng1taUbpmnof7zleQrqStem1oWs=",
+      "requires": {
+        "good-listener": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+        "select": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+        "tiny-emitter": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.0.tgz"
+      }
     },
     "co": {
       "version": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@@ -693,6 +1223,12 @@
       "version": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
       "integrity": "sha1-CHAxKFazB6h8xKxIbzqaYq7MwJ4=",
       "dev": true,
+      "requires": {
+        "convert-source-map": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
+        "inline-source-map": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
+        "lodash.memoize": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz",
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+      },
       "dependencies": {
         "convert-source-map": {
           "version": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz",
@@ -704,7 +1240,10 @@
     "commander": {
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz",
-      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q="
+      "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=",
+      "requires": {
+        "graceful-readlink": "1.0.1"
+      }
     },
     "concat-map": {
       "version": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -715,11 +1254,24 @@
       "version": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
       "integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
       "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+        "typedarray": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+      },
       "dependencies": {
         "readable-stream": {
           "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
           "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+            "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+            "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+          }
         }
       }
     },
@@ -727,18 +1279,30 @@
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.2.tgz",
       "integrity": "sha1-aU6NIGgb/kkCgsiriGvpjwn0L+c=",
+      "requires": {
+        "debug": "2.6.7",
+        "finalhandler": "1.0.3",
+        "parseurl": "1.3.1",
+        "utils-merge": "1.0.0"
+      },
       "dependencies": {
         "debug": {
           "version": "2.6.7",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4="
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "requires": {
+            "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+          }
         }
       }
     },
     "console-browserify": {
       "version": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
       "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "date-now": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+      }
     },
     "constants-browserify": {
       "version": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -757,8 +1321,7 @@
     },
     "core-js": {
       "version": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
-      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=",
-      "dev": true
+      "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4="
     },
     "core-util-is": {
       "version": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
@@ -772,27 +1335,60 @@
     "create-ecdh": {
       "version": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
       "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "elliptic": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz"
+      }
     },
     "create-hash": {
       "version": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
       "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "cipher-base": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "ripemd160": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+        "sha.js": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"
+      }
     },
     "create-hmac": {
       "version": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
       "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "cipher-base": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz",
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "ripemd160": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+        "sha.js": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"
+      }
     },
     "crypto-browserify": {
       "version": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz",
       "integrity": "sha1-NlKgkGq5sqfgw85mpAjpV6JIVSI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "browserify-cipher": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz",
+        "browserify-sign": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+        "create-ecdh": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz",
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "create-hmac": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
+        "diffie-hellman": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "pbkdf2": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz",
+        "public-encrypt": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
+        "randombytes": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz"
+      }
     },
     "d": {
       "version": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
       "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz"
+      }
     },
     "date-now": {
       "version": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
@@ -801,12 +1397,18 @@
     },
     "debug": {
       "version": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
-      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw="
+      "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
+      "requires": {
+        "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+      }
     },
     "deep-eql": {
       "version": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz",
       "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=",
       "dev": true,
+      "requires": {
+        "type-detect": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"
+      },
       "dependencies": {
         "type-detect": {
           "version": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz",
@@ -828,7 +1430,16 @@
     "del": {
       "version": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
       "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "globby": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
+        "is-path-cwd": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
+        "is-path-in-cwd": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+        "pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+        "pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+        "rimraf": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"
+      }
     },
     "delegate": {
       "version": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz",
@@ -837,27 +1448,49 @@
     "deps-sort": {
       "version": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz",
       "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "JSONStream": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+        "shasum": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
+        "subarg": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"
+      }
     },
     "des.js": {
       "version": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
       "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "minimalistic-assert": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
+      }
     },
     "detect-indent": {
       "version": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
       "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "repeating": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
+      }
     },
     "detective": {
       "version": "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz",
       "integrity": "sha1-blqMaybmx6JUsca210kNmOyR7dE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "acorn": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+        "defined": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"
+      }
     },
     "diffie-hellman": {
       "version": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz",
       "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "miller-rabin": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
+        "randombytes": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz"
+      }
     },
     "dirty-chai": {
       "version": "https://registry.npmjs.org/dirty-chai/-/dirty-chai-1.2.2.tgz",
@@ -867,7 +1500,11 @@
     "doctrine": {
       "version": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
       "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+      }
     },
     "domain-browser": {
       "version": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
@@ -877,7 +1514,10 @@
     "duplexer2": {
       "version": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
       "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"
+      }
     },
     "ee-first": {
       "version": "1.1.1",
@@ -887,7 +1527,16 @@
     "elliptic": {
       "version": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz",
       "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "brorand": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+        "hash.js": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
+        "hmac-drbg": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "minimalistic-assert": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+        "minimalistic-crypto-utils": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
+      }
     },
     "encodeurl": {
       "version": "1.0.1",
@@ -897,22 +1546,42 @@
     "error-ex": {
       "version": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
       "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "is-arrayish": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+      }
     },
     "es5-ext": {
       "version": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz",
       "integrity": "sha1-GHbFH5kHacESx4HqPr6J+E/TkHE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "es6-iterator": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+        "es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"
+      }
     },
     "es6-iterator": {
       "version": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
       "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz",
+        "es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"
+      }
     },
     "es6-map": {
       "version": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
       "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz",
+        "es6-iterator": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+        "es6-set": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+        "es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+        "event-emitter": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"
+      }
     },
     "es6-promise": {
       "version": "3.2.1",
@@ -922,17 +1591,34 @@
     "es6-set": {
       "version": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
       "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz",
+        "es6-iterator": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+        "es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+        "event-emitter": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz"
+      }
     },
     "es6-symbol": {
       "version": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
       "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz"
+      }
     },
     "es6-weak-map": {
       "version": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
       "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz",
+        "es6-iterator": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+        "es6-symbol": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz"
+      }
     },
     "escape-html": {
       "version": "1.0.3",
@@ -948,6 +1634,13 @@
       "version": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
       "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
       "dev": true,
+      "requires": {
+        "esprima": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
+        "estraverse": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
+        "esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+        "optionator": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"
+      },
       "dependencies": {
         "esprima": {
           "version": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
@@ -963,24 +1656,73 @@
           "version": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
           "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
           "dev": true,
-          "optional": true
+          "optional": true,
+          "requires": {
+            "amdefine": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
+          }
         }
       }
     },
     "escope": {
       "version": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
       "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "es6-map": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+        "es6-weak-map": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+        "esrecurse": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz",
+        "estraverse": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"
+      }
     },
     "eslint": {
       "version": "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz",
       "integrity": "sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=",
       "dev": true,
+      "requires": {
+        "babel-code-frame": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz",
+        "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+        "concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "doctrine": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
+        "escope": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+        "espree": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz",
+        "esquery": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
+        "estraverse": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+        "esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+        "file-entry-cache": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
+        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+        "globals": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
+        "ignore": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz",
+        "imurmurhash": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+        "inquirer": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+        "is-my-json-valid": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
+        "is-resolvable": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
+        "js-yaml": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz",
+        "json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
+        "levn": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+        "natural-compare": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+        "optionator": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+        "path-is-inside": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+        "pluralize": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
+        "progress": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+        "require-uncached": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+        "shelljs": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz",
+        "strip-bom": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+        "strip-json-comments": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+        "table": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
+        "text-table": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+        "user-home": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"
+      },
       "dependencies": {
         "json-stable-stringify": {
           "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
           "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+          }
         }
       }
     },
@@ -992,17 +1734,29 @@
     "eslint-import-resolver-node": {
       "version": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz",
       "integrity": "sha1-Wt2BBujJKNssuiMrzZ76hG49oWw=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+        "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"
+      }
     },
     "eslint-module-utils": {
       "version": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz",
       "integrity": "sha1-pvjCHZATWHWc3DXbrBmCrh7li84=",
       "dev": true,
+      "requires": {
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+        "pkg-dir": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"
+      },
       "dependencies": {
         "debug": {
           "version": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
           "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "ms": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+          }
         },
         "ms": {
           "version": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
@@ -1015,11 +1769,27 @@
       "version": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.3.0.tgz",
       "integrity": "sha1-N8gB4K2g4pbL3yDD85OstbUq82s=",
       "dev": true,
+      "requires": {
+        "builtin-modules": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+        "contains-path": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "doctrine": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+        "eslint-import-resolver-node": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz",
+        "eslint-module-utils": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.0.0.tgz",
+        "has": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+        "lodash.cond": "https://registry.npmjs.org/lodash.cond/-/lodash.cond-4.5.2.tgz",
+        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "read-pkg-up": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz"
+      },
       "dependencies": {
         "doctrine": {
           "version": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
           "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "esutils": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+          }
         }
       }
     },
@@ -1027,6 +1797,10 @@
       "version": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz",
       "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=",
       "dev": true,
+      "requires": {
+        "acorn": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
+        "acorn-jsx": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz"
+      },
       "dependencies": {
         "acorn": {
           "version": "https://registry.npmjs.org/acorn/-/acorn-5.0.3.tgz",
@@ -1043,12 +1817,19 @@
     "esquery": {
       "version": "https://registry.npmjs.org/esquery/-/esquery-1.0.0.tgz",
       "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "estraverse": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz"
+      }
     },
     "esrecurse": {
       "version": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz",
       "integrity": "sha1-RxO2U2rffyrE8yfVWed1a/9kgiA=",
       "dev": true,
+      "requires": {
+        "estraverse": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+      },
       "dependencies": {
         "estraverse": {
           "version": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz",
@@ -1070,7 +1851,11 @@
     "event-emitter": {
       "version": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
       "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "d": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+        "es5-ext": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.22.tgz"
+      }
     },
     "events": {
       "version": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
@@ -1080,7 +1865,10 @@
     "evp_bytestokey": {
       "version": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz",
       "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz"
+      }
     },
     "exit-hook": {
       "version": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
@@ -1094,56 +1882,103 @@
     },
     "field-kit": {
       "version": "https://registry.npmjs.org/field-kit/-/field-kit-2.1.0.tgz",
-      "integrity": "sha1-5o7eX04wUbLcQlgQWklcVBo7LX8="
+      "integrity": "sha1-5o7eX04wUbLcQlgQWklcVBo7LX8=",
+      "requires": {
+        "input-sim": "https://registry.npmjs.org/input-sim/-/input-sim-3.1.0.tgz",
+        "stround": "https://registry.npmjs.org/stround/-/stround-0.3.1.tgz"
+      }
     },
     "figures": {
       "version": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
       "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+      }
     },
     "file-entry-cache": {
       "version": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz",
       "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "flat-cache": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
+      }
     },
     "fill-keys": {
       "version": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
       "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "is-object": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
+        "merge-descriptors": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+      }
     },
     "finalhandler": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
       "integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
+      "requires": {
+        "debug": "2.6.7",
+        "encodeurl": "1.0.1",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.1",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
       "dependencies": {
         "debug": {
           "version": "2.6.7",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.7.tgz",
-          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4="
+          "integrity": "sha1-krrR9tBbu2u6Isyoi80OyJTChh4=",
+          "requires": {
+            "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+          }
         }
       }
     },
     "find-up": {
       "version": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "path-exists": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
+        "pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+      }
     },
     "flat-cache": {
       "version": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz",
       "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "circular-json": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.1.tgz",
+        "del": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
+        "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+        "write": "https://registry.npmjs.org/write/-/write-0.2.1.tgz"
+      }
     },
     "flex-object": {
       "version": "https://registry.npmjs.org/flex-object/-/flex-object-2.0.5.tgz",
-      "integrity": "sha1-Ebm7wPT4ZOncYH6YzixnBEK9yFE="
+      "integrity": "sha1-Ebm7wPT4ZOncYH6YzixnBEK9yFE=",
+      "requires": {
+        "basscss-defaults": "https://registry.npmjs.org/basscss-defaults/-/basscss-defaults-2.1.3.tgz"
+      }
     },
     "focus-trap": {
       "version": "https://registry.npmjs.org/focus-trap/-/focus-trap-2.3.0.tgz",
-      "integrity": "sha1-B8kZZIZ9NGMV9PX434i/lkVTFuI="
+      "integrity": "sha1-B8kZZIZ9NGMV9PX434i/lkVTFuI=",
+      "requires": {
+        "tabbable": "https://registry.npmjs.org/tabbable/-/tabbable-1.0.6.tgz"
+      }
     },
     "formatio": {
       "version": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
-      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek="
+      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
+      "requires": {
+        "samsam": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"
+      }
     },
     "fs.realpath": {
       "version": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -1163,12 +1998,23 @@
     "generate-object-property": {
       "version": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
       "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "is-property": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+      }
     },
     "glob": {
       "version": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
       "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "fs.realpath": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+        "inflight": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "minimatch": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+        "path-is-absolute": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+      }
     },
     "globals": {
       "version": "https://registry.npmjs.org/globals/-/globals-9.17.0.tgz",
@@ -1178,11 +2024,22 @@
     "globby": {
       "version": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
       "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "array-union": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+        "arrify": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+        "object-assign": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+        "pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+        "pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+      }
     },
     "good-listener": {
       "version": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA="
+      "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
+      "requires": {
+        "delegate": "https://registry.npmjs.org/delegate/-/delegate-3.1.3.tgz"
+      }
     },
     "graceful-fs": {
       "version": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -1197,27 +2054,42 @@
     "has": {
       "version": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
       "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "function-bind": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"
+      }
     },
     "has-ansi": {
       "version": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
       "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+      }
     },
     "has-require": {
       "version": "https://registry.npmjs.org/has-require/-/has-require-1.2.2.tgz",
       "integrity": "sha1-khZ1qxMNvZdo/I2o8ajiQt+kF3Q=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+      }
     },
     "hash-base": {
       "version": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
       "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "hash.js": {
       "version": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
       "integrity": "sha1-EzL/ABVsCg/92CNgE9B7d6BFFXM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "hint.css": {
       "version": "https://registry.npmjs.org/hint.css/-/hint.css-2.5.0.tgz",
@@ -1226,12 +2098,21 @@
     "hmac-drbg": {
       "version": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
       "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "hash.js": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz",
+        "minimalistic-assert": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
+        "minimalistic-crypto-utils": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"
+      }
     },
     "home-or-tmp": {
       "version": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
       "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+        "os-tmpdir": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+      }
     },
     "hooks-fixed": {
       "version": "2.0.0",
@@ -1253,6 +2134,15 @@
       "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=",
       "dev": true
     },
+    "identity-style-guide": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/identity-style-guide/-/identity-style-guide-0.2.5.tgz",
+      "integrity": "sha1-c6xPTZN0IvSm14BMWtKZt8LKLt0=",
+      "requires": {
+        "basscss-sass": "https://registry.npmjs.org/basscss-sass/-/basscss-sass-3.0.0.tgz",
+        "normalize.css": "https://registry.npmjs.org/normalize.css/-/normalize.css-4.2.0.tgz"
+      }
+    },
     "ieee754": {
       "version": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz",
       "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=",
@@ -1276,7 +2166,11 @@
     "inflight": {
       "version": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+        "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+      }
     },
     "inherits": {
       "version": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
@@ -1285,7 +2179,10 @@
     "inline-source-map": {
       "version": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz",
       "integrity": "sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+      }
     },
     "input-sim": {
       "version": "https://registry.npmjs.org/input-sim/-/input-sim-3.1.0.tgz",
@@ -1294,12 +2191,37 @@
     "inquirer": {
       "version": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
       "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "ansi-escapes": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+        "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+        "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+        "cli-cursor": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+        "cli-width": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz",
+        "figures": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "readline2": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
+        "run-async": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
+        "rx-lite": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
+        "string-width": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+        "through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+      }
     },
     "insert-module-globals": {
       "version": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz",
       "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "combine-source-map": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz",
+        "concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
+        "is-buffer": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz",
+        "JSONStream": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+        "lexical-scope": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
+        "process": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "interpret": {
       "version": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
@@ -1309,7 +2231,10 @@
     "invariant": {
       "version": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
       "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "loose-envify": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz"
+      }
     },
     "is-arrayish": {
       "version": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -1324,22 +2249,37 @@
     "is-builtin-module": {
       "version": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
       "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "builtin-modules": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
+      }
     },
     "is-finite": {
       "version": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
       "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+      }
     },
     "is-fullwidth-code-point": {
       "version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
       "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "number-is-nan": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+      }
     },
     "is-my-json-valid": {
       "version": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz",
       "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "generate-function": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+        "generate-object-property": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+        "jsonpointer": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "is-object": {
       "version": "https://registry.npmjs.org/is-object/-/is-object-1.0.1.tgz",
@@ -1354,12 +2294,18 @@
     "is-path-in-cwd": {
       "version": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz",
       "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "is-path-inside": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz"
+      }
     },
     "is-path-inside": {
       "version": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz",
       "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "path-is-inside": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"
+      }
     },
     "is-property": {
       "version": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
@@ -1369,7 +2315,10 @@
     "is-resolvable": {
       "version": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
       "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "tryit": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz"
+      }
     },
     "isarray": {
       "version": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -1383,7 +2332,11 @@
     "js-yaml": {
       "version": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.4.tgz",
       "integrity": "sha1-UgtFZPhlc7qWZir4Woyvp7S1pvY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "argparse": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
+        "esprima": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"
+      }
     },
     "jsesc": {
       "version": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
@@ -1393,7 +2346,10 @@
     "json-stable-stringify": {
       "version": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
       "integrity": "sha1-YRwj6BTbN1Un34URk9tZ3Sryf0U=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+      }
     },
     "json5": {
       "version": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
@@ -1418,7 +2374,11 @@
     "JSONStream": {
       "version": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
       "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "jsonparse": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
+        "through": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+      }
     },
     "kareem": {
       "version": "1.4.2",
@@ -1429,6 +2389,11 @@
       "version": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz",
       "integrity": "sha1-pS4dE4AkwAuGscDJH2d5GLiuClk=",
       "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+        "stream-splicer": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"
+      },
       "dependencies": {
         "isarray": {
           "version": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
@@ -1440,22 +2405,50 @@
     "levn": {
       "version": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "prelude-ls": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+        "type-check": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
+      }
     },
     "lexical-scope": {
       "version": "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz",
       "integrity": "sha1-/Ope3HBKSzqHls3KQZw6CvryLfQ=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "astw": "https://registry.npmjs.org/astw/-/astw-2.2.0.tgz"
+      }
+    },
+    "libphonenumber-js": {
+      "version": "0.4.27",
+      "resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-0.4.27.tgz",
+      "integrity": "sha1-nOTQQv3Q6z+YBImKi/4SqEsU4fY=",
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "bluebird": "2.10.2",
+        "minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+        "xml2js": "0.4.18"
+      }
     },
     "load-json-file": {
       "version": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
       "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "graceful-fs": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+        "parse-json": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+        "pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+        "strip-bom": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
+      }
     },
     "locate-path": {
       "version": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
       "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
       "dev": true,
+      "requires": {
+        "p-locate": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+        "path-exists": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"
+      },
       "dependencies": {
         "path-exists": {
           "version": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
@@ -1485,7 +2478,10 @@
     "loose-envify": {
       "version": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz",
       "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "js-tokens": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.1.tgz"
+      }
     },
     "merge-descriptors": {
       "version": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
@@ -1495,7 +2491,11 @@
     "miller-rabin": {
       "version": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz",
       "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "brorand": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
+      }
     },
     "mime": {
       "version": "1.3.6",
@@ -1515,7 +2515,10 @@
     "minimatch": {
       "version": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "brace-expansion": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz"
+      }
     },
     "minimist": {
       "version": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
@@ -1524,17 +2527,40 @@
     "mkdirp": {
       "version": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
       "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+      }
     },
     "modulator": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/modulator/-/modulator-0.1.0.tgz",
-      "integrity": "sha1-z9UVhD+R1nPxVWHZeZ33gErQMmY="
+      "integrity": "sha1-z9UVhD+R1nPxVWHZeZ33gErQMmY=",
+      "requires": {
+        "uglify-js": "3.0.25"
+      }
     },
     "module-deps": {
       "version": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
       "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "browser-resolve": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz",
+        "cached-path-relative": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.0.1.tgz",
+        "concat-stream": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz",
+        "defined": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+        "detective": "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz",
+        "duplexer2": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "JSONStream": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz",
+        "parents": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
+        "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
+        "stream-combiner2": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+        "subarg": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
+        "through2": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "module-not-found-error": {
       "version": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
@@ -1545,38 +2571,76 @@
       "version": "2.2.27",
       "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.27.tgz",
       "integrity": "sha1-NBIgNNtm2YO89qta2yaiSnD+9uY=",
+      "requires": {
+        "es6-promise": "3.2.1",
+        "mongodb-core": "2.1.11",
+        "readable-stream": "2.2.7"
+      },
       "dependencies": {
         "readable-stream": {
           "version": "2.2.7",
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
-          "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE="
+          "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
+          "requires": {
+            "buffer-shims": "1.0.0",
+            "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+            "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+            "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+          }
         },
         "safe-buffer": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-          "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
+          "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM="
         },
         "string_decoder": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ=="
+          "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
         }
       }
     },
     "mongodb-core": {
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.11.tgz",
-      "integrity": "sha1-HDh3bOsXSZepnCiGDu2QKNqbPho="
+      "integrity": "sha1-HDh3bOsXSZepnCiGDu2QKNqbPho=",
+      "requires": {
+        "bson": "1.0.4",
+        "require_optional": "1.0.1"
+      }
     },
     "mongoose": {
       "version": "4.11.3",
       "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.11.3.tgz",
       "integrity": "sha1-+T1CeygsLnmLD+FTL7Qafd5umNM=",
+      "requires": {
+        "async": "2.1.4",
+        "bson": "1.0.4",
+        "hooks-fixed": "2.0.0",
+        "kareem": "1.4.2",
+        "mongodb": "2.2.27",
+        "mpath": "0.3.0",
+        "mpromise": "0.5.5",
+        "mquery": "2.3.1",
+        "ms": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+        "muri": "1.2.2",
+        "regexp-clone": "0.0.1",
+        "sliced": "1.0.1"
+      },
       "dependencies": {
         "async": {
           "version": "2.1.4",
           "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz",
-          "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ="
+          "integrity": "sha1-LSFgx3iAMuTdbL4lAvH5osj2zeQ=",
+          "requires": {
+            "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
+          }
         }
       }
     },
@@ -1594,6 +2658,12 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.1.tgz",
       "integrity": "sha1-mrNnSXFIAP8LtTpoHOS8TV8HyHs=",
+      "requires": {
+        "bluebird": "2.10.2",
+        "debug": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
+        "regexp-clone": "0.0.1",
+        "sliced": "0.0.5"
+      },
       "dependencies": {
         "sliced": {
           "version": "0.0.5",
@@ -1624,7 +2694,13 @@
     "normalize-package-data": {
       "version": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
       "integrity": "sha1-2Bntoqne29H/pWPqQHHZNngilbs=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "hosted-git-info": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.2.tgz",
+        "is-builtin-module": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+        "semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
+        "validate-npm-package-license": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+      }
     },
     "normalize.css": {
       "version": "https://registry.npmjs.org/normalize.css/-/normalize.css-4.2.0.tgz",
@@ -1643,12 +2719,18 @@
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "requires": {
+        "ee-first": "1.1.1"
+      }
     },
     "once": {
       "version": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "wrappy": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+      }
     },
     "onetime": {
       "version": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
@@ -1659,6 +2741,10 @@
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
       "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "requires": {
+        "minimist": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+        "wordwrap": "0.0.3"
+      },
       "dependencies": {
         "wordwrap": {
           "version": "0.0.3",
@@ -1670,7 +2756,15 @@
     "optionator": {
       "version": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
       "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "deep-is": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+        "fast-levenshtein": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+        "levn": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+        "prelude-ls": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+        "type-check": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+        "wordwrap": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
+      }
     },
     "os-browserify": {
       "version": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz",
@@ -1695,7 +2789,10 @@
     "p-locate": {
       "version": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
       "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "p-limit": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz"
+      }
     },
     "pako": {
       "version": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
@@ -1705,17 +2802,30 @@
     "parents": {
       "version": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz",
       "integrity": "sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "path-platform": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"
+      }
     },
     "parse-asn1": {
       "version": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
       "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "asn1.js": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz",
+        "browserify-aes": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz",
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "evp_bytestokey": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz",
+        "pbkdf2": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz"
+      }
     },
     "parse-json": {
       "version": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
       "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "error-ex": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"
+      }
     },
     "parseurl": {
       "version": "1.3.1",
@@ -1730,7 +2840,10 @@
     "path-exists": {
       "version": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
       "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "pinkie-promise": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+      }
     },
     "path-is-absolute": {
       "version": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -1755,12 +2868,22 @@
     "path-type": {
       "version": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
       "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "pify": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+      }
     },
     "pbkdf2": {
       "version": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz",
       "integrity": "sha1-vjZ4XFBn6kjYBv+SMojF91C2uKI=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "create-hmac": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz",
+        "ripemd160": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+        "sha.js": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"
+      }
     },
     "pff": {
       "version": "https://registry.npmjs.org/pff/-/pff-1.0.0.tgz",
@@ -1780,12 +2903,18 @@
     "pinkie-promise": {
       "version": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
       "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "pinkie": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+      }
     },
     "pkg-dir": {
       "version": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
       "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "find-up": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
+      }
     },
     "pluralize": {
       "version": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz",
@@ -1820,6 +2949,16 @@
       "version": "https://registry.npmjs.org/proxyquireify/-/proxyquireify-3.2.1.tgz",
       "integrity": "sha1-Fb7hATYKzJHc2G7k2aRF+Klx7qA=",
       "dev": true,
+      "requires": {
+        "browser-pack": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz",
+        "detective": "https://registry.npmjs.org/detective/-/detective-4.1.1.tgz",
+        "fill-keys": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+        "has-require": "https://registry.npmjs.org/has-require/-/has-require-1.2.2.tgz",
+        "module-not-found-error": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+        "require-deps": "https://registry.npmjs.org/require-deps/-/require-deps-1.0.1.tgz",
+        "through": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
+      },
       "dependencies": {
         "acorn": {
           "version": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
@@ -1829,7 +2968,12 @@
         "detective": {
           "version": "https://registry.npmjs.org/detective/-/detective-4.1.1.tgz",
           "integrity": "sha1-nEusHp+4uzT38YyuCA6h0Dr/LNo=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "acorn": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz",
+            "defined": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
+            "escodegen": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"
+          }
         },
         "through": {
           "version": "https://registry.npmjs.org/through/-/through-2.2.7.tgz",
@@ -1846,7 +2990,14 @@
     "public-encrypt": {
       "version": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz",
       "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "bn.js": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz",
+        "browserify-rsa": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+        "create-hash": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz",
+        "parse-asn1": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz",
+        "randombytes": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz"
+      }
     },
     "punycode": {
       "version": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -1866,27 +3017,45 @@
     "randombytes": {
       "version": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.4.tgz",
       "integrity": "sha1-lVHfIIQiyPgOtY4jJt0LhA/yLv0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
+      }
     },
     "read-only-stream": {
       "version": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz",
       "integrity": "sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"
+      }
     },
     "read-pkg": {
       "version": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
       "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "load-json-file": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+        "normalize-package-data": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.8.tgz",
+        "path-type": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz"
+      }
     },
     "read-pkg-up": {
       "version": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
       "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
       "dev": true,
+      "requires": {
+        "find-up": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+        "read-pkg": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz"
+      },
       "dependencies": {
         "find-up": {
           "version": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
           "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "locate-path": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"
+          }
         }
       }
     },
@@ -1894,23 +3063,43 @@
       "version": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
       "integrity": "sha1-7/5yu3yITA3TNeI3nVJhltnQEe4=",
       "dev": true,
+      "requires": {
+        "core-util-is": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "isarray": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+        "process-nextick-args": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+        "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz",
+        "string_decoder": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
+        "util-deprecate": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+      },
       "dependencies": {
         "string_decoder": {
           "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
           "integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "safe-buffer": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"
+          }
         }
       }
     },
     "readline2": {
       "version": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz",
       "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "code-point-at": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+        "is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+        "mute-stream": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
+      }
     },
     "rechoir": {
       "version": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
       "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "resolve": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz"
+      }
     },
     "regenerate": {
       "version": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
@@ -1919,13 +3108,17 @@
     },
     "regenerator-runtime": {
       "version": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
-      "dev": true
+      "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
     },
     "regenerator-transform": {
       "version": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz",
       "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "babel-runtime": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz",
+        "babel-types": "https://registry.npmjs.org/babel-types/-/babel-types-6.24.1.tgz",
+        "private": "https://registry.npmjs.org/private/-/private-0.1.7.tgz"
+      }
     },
     "regexp-clone": {
       "version": "0.0.1",
@@ -1935,7 +3128,12 @@
     "regexpu-core": {
       "version": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
       "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "regenerate": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz",
+        "regjsgen": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
+        "regjsparser": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz"
+      }
     },
     "regjsgen": {
       "version": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",
@@ -1945,17 +3143,27 @@
     "regjsparser": {
       "version": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
       "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "jsesc": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+      }
     },
     "repeating": {
       "version": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
       "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "is-finite": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"
+      }
     },
     "require_optional": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
-      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "integrity": "sha1-TPNaQkf2TKPfjC7yCMxJSxyo/C4=",
+      "requires": {
+        "resolve-from": "2.0.0",
+        "semver": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
+      },
       "dependencies": {
         "resolve-from": {
           "version": "2.0.0",
@@ -1967,17 +3175,27 @@
     "require-deps": {
       "version": "https://registry.npmjs.org/require-deps/-/require-deps-1.0.1.tgz",
       "integrity": "sha1-JBXPScNb02pdMXc5UQjT8jcgUmM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "pff": "https://registry.npmjs.org/pff/-/pff-1.0.0.tgz"
+      }
     },
     "require-uncached": {
       "version": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
       "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "caller-path": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz",
+        "resolve-from": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"
+      }
     },
     "resolve": {
       "version": "https://registry.npmjs.org/resolve/-/resolve-1.3.3.tgz",
       "integrity": "sha1-ZVkHw0aahoDcLeOidaj91paR8OU=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "path-parse": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz"
+      }
     },
     "resolve-from": {
       "version": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
@@ -1987,22 +3205,36 @@
     "restore-cursor": {
       "version": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
       "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "exit-hook": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz",
+        "onetime": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
+      }
     },
     "rimraf": {
       "version": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz",
       "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz"
+      }
     },
     "ripemd160": {
       "version": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz",
       "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "hash-base": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "run-async": {
       "version": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz",
       "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "once": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+      }
     },
     "rx-lite": {
       "version": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz",
@@ -2018,6 +3250,11 @@
       "version": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc="
     },
+    "sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk="
+    },
     "select": {
       "version": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
@@ -2029,26 +3266,50 @@
     "sha.js": {
       "version": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz",
       "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "shasum": {
       "version": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz",
       "integrity": "sha1-5wEjENj0F/TetXEhUOVni4euVl8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "json-stable-stringify": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz",
+        "sha.js": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"
+      }
     },
     "shell-quote": {
       "version": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz",
       "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "array-filter": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+        "array-map": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+        "array-reduce": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+        "jsonify": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
+      }
     },
     "shelljs": {
       "version": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.7.tgz",
       "integrity": "sha1-svXHfvlxSPS09uImguELuoZnz/E=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "glob": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+        "interpret": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz",
+        "rechoir": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
+      }
     },
     "sinon": {
       "version": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz",
-      "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8="
+      "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=",
+      "requires": {
+        "formatio": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+        "lolex": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
+        "samsam": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+        "util": "https://registry.npmjs.org/util/-/util-0.10.3.tgz"
+      }
     },
     "slash": {
       "version": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
@@ -2072,12 +3333,18 @@
     "source-map-support": {
       "version": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz",
       "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+      }
     },
     "spdx-correct": {
       "version": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
       "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "spdx-license-ids": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"
+      }
     },
     "spdx-expression-parse": {
       "version": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz",
@@ -2102,22 +3369,41 @@
     "stream-browserify": {
       "version": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz",
       "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"
+      }
     },
     "stream-combiner2": {
       "version": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
       "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "duplexer2": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"
+      }
     },
     "stream-http": {
       "version": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.1.tgz",
       "integrity": "sha1-VGpRdBrVprB+njGwsQRBqRffUoo=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "builtin-status-codes": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
+        "to-arraybuffer": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "stream-splicer": {
       "version": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz",
       "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz"
+      }
     },
     "string_decoder": {
       "version": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -2127,12 +3413,20 @@
     "string-width": {
       "version": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
       "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "code-point-at": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+        "is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+        "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+      }
     },
     "strip-ansi": {
       "version": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
       "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "ansi-regex": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
+      }
     },
     "strip-bom": {
       "version": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -2152,6 +3446,9 @@
       "version": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz",
       "integrity": "sha1-9izxdYHplrSPyWVpn1TAauJouNI=",
       "dev": true,
+      "requires": {
+        "minimist": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+      },
       "dependencies": {
         "minimist": {
           "version": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
@@ -2168,7 +3465,10 @@
     "syntax-error": {
       "version": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz",
       "integrity": "sha1-HtkmbE1AvnXcVb+bsct3Biu5bKE=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "acorn": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz"
+      }
     },
     "tabbable": {
       "version": "https://registry.npmjs.org/tabbable/-/tabbable-1.0.6.tgz",
@@ -2178,6 +3478,14 @@
       "version": "https://registry.npmjs.org/table/-/table-3.8.3.tgz",
       "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=",
       "dev": true,
+      "requires": {
+        "ajv": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
+        "ajv-keywords": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
+        "chalk": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+        "lodash": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+        "slice-ansi": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz",
+        "string-width": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz"
+      },
       "dependencies": {
         "is-fullwidth-code-point": {
           "version": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -2187,7 +3495,11 @@
         "string-width": {
           "version": "https://registry.npmjs.org/string-width/-/string-width-2.0.0.tgz",
           "integrity": "sha1-Y1xUNsxypuDDh87KJ41OLuxSaH4=",
-          "dev": true
+          "dev": true,
+          "requires": {
+            "is-fullwidth-code-point": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+            "strip-ansi": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+          }
         }
       }
     },
@@ -2204,12 +3516,19 @@
     "through2": {
       "version": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
       "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "readable-stream": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.10.tgz",
+        "xtend": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+      }
     },
     "timers-browserify": {
       "version": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
       "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "process": "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
+      }
     },
     "tiny-emitter": {
       "version": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.0.0.tgz",
@@ -2243,7 +3562,10 @@
     "type-check": {
       "version": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "prelude-ls": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
+      }
     },
     "type-detect": {
       "version": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz",
@@ -2258,7 +3580,11 @@
     "uglify-js": {
       "version": "3.0.25",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.25.tgz",
-      "integrity": "sha512-JO1XE0WZ9m6UpDkN7WCyPNAWI6EN3K0g40ekcoJKejViYmryJ0BaLxXjvra1IsAeIlJfq72scTbhl0jknsT2GA=="
+      "integrity": "sha1-PcGQsO5DdJfkSbxveFZlsGr74FI=",
+      "requires": {
+        "commander": "2.9.0",
+        "source-map": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+      }
     },
     "umd": {
       "version": "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz",
@@ -2274,6 +3600,10 @@
       "version": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
       "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
       "dev": true,
+      "requires": {
+        "punycode": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+        "querystring": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+      },
       "dependencies": {
         "punycode": {
           "version": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
@@ -2285,11 +3615,17 @@
     "user-home": {
       "version": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
       "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "os-homedir": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
+      }
     },
     "util": {
       "version": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk="
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "requires": {
+        "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+      }
     },
     "util-deprecate": {
       "version": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -2303,12 +3639,19 @@
     "validate-npm-package-license": {
       "version": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz",
       "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "spdx-correct": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz",
+        "spdx-expression-parse": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"
+      }
     },
     "vm-browserify": {
       "version": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
       "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "indexof": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+      }
     },
     "wordwrap": {
       "version": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
@@ -2323,7 +3666,24 @@
     "write": {
       "version": "https://registry.npmjs.org/write/-/write-0.2.1.tgz",
       "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=",
-      "dev": true
+      "dev": true,
+      "requires": {
+        "mkdirp": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+      }
+    },
+    "xml2js": {
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.18.tgz",
+      "integrity": "sha512-MMUtkwryoXmYoFUBT32tf7vYPHr98h6VtRLVbsjfmS5hqpp/deRMUNLZNQUHEAY4ChwyBEkisDYhH/EP15X6oA==",
+      "requires": {
+        "sax": "1.2.4",
+        "xmlbuilder": "9.0.4"
+      }
+    },
+    "xmlbuilder": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.4.tgz",
+      "integrity": "sha1-UZy0ymhtAFqEINNJbz8MruzKWA8="
     },
     "xtend": {
       "version": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/package.json b/package.json
index 5e216e62d1e..fcd69447999 100644
--- a/package.json
+++ b/package.json
@@ -6,16 +6,22 @@
     "node": "~4.4.x",
     "npm": "~3.8.x"
   },
+  "scripts": {
+    "build": "npm run clean && npm run make-dirs && npm run copy",
+    "clean": "rm -rf ./vendor/assets/fonts && rm -f ./public/*.ico && rm -f ./public/*.png && rm -f ./public/*.svg && rm -f ./public/browserconfig.xml && rm -f ./public/manifest.json",
+    "copy": "npm run copy-font && npm run copy-favicons",
+    "copy-favicons": "cp node_modules/identity-style-guide/src/favicons/* ./public",
+    "copy-font": "cp node_modules/identity-style-guide/src/font/* ./vendor/assets/fonts/",
+    "make-dirs": "mkdir -p ./vendor/assets/fonts"
+  },
   "dependencies": {
     "app": "^0.1.0",
-    "basscss-sass": "^3.0.0",
     "classlist.js": "^1.1.20150312",
     "clipboard": "^1.6.1",
     "field-kit": "^2.1.0",
     "focus-trap": "^2.3.0",
-    "hint.css": "^2.3.2",
+    "identity-style-guide": "0.2.6",
     "libphonenumber-js": "^0.4.23",
-    "normalize.css": "^4.2.0",
     "sinon": "^1.17.7",
     "zxcvbn": "^4.4.2"
   },
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
deleted file mode 100644
index ca68c112c39..00000000000
Binary files a/public/android-chrome-192x192.png and /dev/null differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index f1cb06f8693..00000000000
Binary files a/public/apple-touch-icon.png and /dev/null differ
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
deleted file mode 100644
index 4a718762cf5..00000000000
--- a/public/browserconfig.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-  <msapplication>
-    <tile>
-      <square150x150logo src="/mstile-150x150.png"/>
-      <TileColor>#2b5797</TileColor>
-    </tile>
-  </msapplication>
-</browserconfig>
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
deleted file mode 100644
index 1d6eb611baa..00000000000
Binary files a/public/favicon-16x16.png and /dev/null differ
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
deleted file mode 100644
index 238fa1caadb..00000000000
Binary files a/public/favicon-32x32.png and /dev/null differ
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index 7edfd94950f..00000000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/manifest.json b/public/manifest.json
deleted file mode 100644
index f73ffef4e25..00000000000
--- a/public/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"name": "login.gov",
-	"icons": [
-		{
-			"src": "\/android-chrome-192x192.png",
-			"sizes": "192x192",
-			"type": "image\/png"
-		}
-	],
-	"theme_color": "#ffffff",
-	"display": "standalone"
-}
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
deleted file mode 100644
index ace52e08cc1..00000000000
Binary files a/public/mstile-150x150.png and /dev/null differ
diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg
deleted file mode 100644
index 31e814a274f..00000000000
--- a/public/safari-pinned-tab.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="500.000000pt" height="500.000000pt" viewBox="0 0 500.000000 500.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,500.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M1215 4629 c-89 -13 -191 -67 -258 -138 -73 -76 -113 -161 -127 -266
--7 -53 -10 -472 -8 -1251 l3 -1170 37 -75 c178 -360 602 -775 1097 -1072 130
--78 394 -217 488 -257 l52 -22 130 60 c361 167 743 419 1006 662 218 201 413
-447 508 639 l32 66 3 1170 c2 780 -1 1197 -8 1250 -26 199 -163 355 -351 400
--55 13 -230 15 -1304 14 -682 -1 -1267 -5 -1300 -10z m1398 -994 c89 -23 156
--62 222 -129 182 -182 189 -466 14 -651 l-51 -54 78 -445 c43 -245 75 -448 73
--451 -3 -2 -59 -11 -124 -20 -160 -22 -500 -22 -654 -1 -62 8 -115 17 -117 19
--2 1 32 203 75 447 l77 444 -48 49 c-122 122 -165 316 -107 484 77 225 336
-367 562 308z"/>
-</g>
-</svg>
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 46fcb4707a3..1e1d676cc21 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -4,7 +4,7 @@
   describe '#disable_caching' do
     controller do
       def index
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -57,7 +57,7 @@ def index
       before_action :confirm_two_factor_authenticated
 
       def index
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -147,13 +147,13 @@ def index
       prepend_before_action :session_expires_at
 
       def index
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
     context 'when URL contains the host parameter' do
       it 'does not redirect to the host' do
-        get :index, timeout: true, host: 'www.monfresh.com'
+        get :index, params: { timeout: true, host: 'www.monfresh.com' }
 
         expect(response.header['Location']).to_not match 'www.monfresh.com'
       end
@@ -161,7 +161,7 @@ def index
 
     context 'when URL does not contain the timeout parameter' do
       it 'does not redirect anywhere' do
-        get :index, host: 'www.monfresh.com'
+        get :index, params: { host: 'www.monfresh.com' }
 
         expect(response).to_not be_redirect
       end
@@ -169,7 +169,7 @@ def index
 
     context 'when URL contains the request_id parameter' do
       it 'preserves the request_id parameter' do
-        get :index, timeout: true, request_id: '123'
+        get :index, params: { timeout: true, request_id: '123' }
 
         expect(response.header['Location']).to match '123'
       end
diff --git a/spec/controllers/concerns/idv_step_concern_spec.rb b/spec/controllers/concerns/idv_step_concern_spec.rb
index 5ef8adc5281..4d76c6609d2 100644
--- a/spec/controllers/concerns/idv_step_concern_spec.rb
+++ b/spec/controllers/concerns/idv_step_concern_spec.rb
@@ -17,7 +17,7 @@ class StepController < ApplicationController
       before_action :confirm_idv_attempts_allowed
 
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -79,7 +79,7 @@ def show
       before_action :confirm_idv_session_started
 
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -121,7 +121,7 @@ def show
       before_action :confirm_idv_needed
 
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
diff --git a/spec/controllers/mfa_confirmation_controller_spec.rb b/spec/controllers/mfa_confirmation_controller_spec.rb
index 296e38dc753..feebbce698f 100644
--- a/spec/controllers/mfa_confirmation_controller_spec.rb
+++ b/spec/controllers/mfa_confirmation_controller_spec.rb
@@ -31,7 +31,7 @@
 
     context 'password is empty' do
       it 'redirects with error message and increments password attempts' do
-        post :create, user: { password: '' }
+        post :create, params: { user: { password: '' } }
 
         expect(response).to redirect_to(user_password_confirm_path)
         expect(flash[:error]).to eq t('errors.confirm_password_incorrect')
@@ -41,7 +41,7 @@
 
     context 'password is wrong' do
       it 'redirects with error message and increments password attempts' do
-        post :create, user: { password: 'wrong' }
+        post :create, params: { user: { password: 'wrong' } }
 
         expect(response).to redirect_to(user_password_confirm_path)
         expect(flash[:error]).to eq t('errors.confirm_password_incorrect')
@@ -51,7 +51,7 @@
 
     context 'password is correct' do
       it 'redirects to 2FA and resets password attempts' do
-        post :create, user: { password: 'password' }
+        post :create, params: { user: { password: 'password' } }
 
         expect(response).to redirect_to(user_two_factor_authentication_path(reauthn: true))
         expect(session[:password_attempts]).to eq 0
@@ -70,7 +70,7 @@
 
         max_allowed_attempts = Figaro.env.password_max_attempts.to_i
         max_allowed_attempts.times do
-          post :create, user: { password: 'wrong' }
+          post :create, params: { user: { password: 'wrong' } }
         end
 
         expect(response).to redirect_to(root_path)
@@ -89,10 +89,10 @@
 
         max_allowed_attempts = Figaro.env.password_max_attempts.to_i
         (max_allowed_attempts - 1).times do
-          post :create, user: { password: 'wrong' }
+          post :create, params: { user: { password: 'wrong' } }
         end
 
-        post :create, user: { password: 'password' }
+        post :create, params: { user: { password: 'password' } }
 
         expect(response).to redirect_to user_two_factor_authentication_path(reauthn: true)
       end
diff --git a/spec/controllers/openid_connect/authorization_controller_spec.rb b/spec/controllers/openid_connect/authorization_controller_spec.rb
index 0315fa4c4d9..7d407afbbbf 100644
--- a/spec/controllers/openid_connect/authorization_controller_spec.rb
+++ b/spec/controllers/openid_connect/authorization_controller_spec.rb
@@ -16,7 +16,7 @@
   end
 
   describe '#index' do
-    subject(:action) { get :index, params }
+    subject(:action) { get :index, params: params }
 
     context 'user is signed in' do
       let(:user) { create(:user, :signed_up) }
diff --git a/spec/controllers/openid_connect/logout_controller_spec.rb b/spec/controllers/openid_connect/logout_controller_spec.rb
index 739f399fb46..99370e75446 100644
--- a/spec/controllers/openid_connect/logout_controller_spec.rb
+++ b/spec/controllers/openid_connect/logout_controller_spec.rb
@@ -26,9 +26,11 @@
   describe '#index' do
     subject(:action) do
       get :index,
-          id_token_hint: id_token_hint,
-          post_logout_redirect_uri: post_logout_redirect_uri,
-          state: state
+          params: {
+            id_token_hint: id_token_hint,
+            post_logout_redirect_uri: post_logout_redirect_uri,
+            state: state,
+          }
     end
 
     context 'user is signed in' do
diff --git a/spec/controllers/openid_connect/token_controller_spec.rb b/spec/controllers/openid_connect/token_controller_spec.rb
index a254a954865..18a2f82aa17 100644
--- a/spec/controllers/openid_connect/token_controller_spec.rb
+++ b/spec/controllers/openid_connect/token_controller_spec.rb
@@ -6,10 +6,12 @@
   describe '#create' do
     subject(:action) do
       post :create,
-           grant_type: grant_type,
-           code: code,
-           client_assertion_type: OpenidConnectTokenForm::CLIENT_ASSERTION_TYPE,
-           client_assertion: client_assertion
+           params: {
+             grant_type: grant_type,
+             code: code,
+             client_assertion_type: OpenidConnectTokenForm::CLIENT_ASSERTION_TYPE,
+             client_assertion: client_assertion,
+           }
     end
 
     let(:user) { create(:user) }
@@ -77,13 +79,4 @@
       end
     end
   end
-
-  describe '#options' do
-    it 'is empty so it can be used as a pre-flight request' do
-      process :options, 'OPTIONS'
-
-      expect(response).to be_ok
-      expect(response.body).to be_empty
-    end
-  end
 end
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
index 1875cc053d1..3b4f17a7427 100644
--- a/spec/controllers/pages_controller_spec.rb
+++ b/spec/controllers/pages_controller_spec.rb
@@ -4,7 +4,7 @@
   describe 'analytics' do
     controller do
       def index
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -28,7 +28,7 @@ def index
   describe 'content expiry' do
     controller do
       def index
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
diff --git a/spec/controllers/reauthn_required_controller_spec.rb b/spec/controllers/reauthn_required_controller_spec.rb
index 5017199a9a3..16ba88ab1f7 100644
--- a/spec/controllers/reauthn_required_controller_spec.rb
+++ b/spec/controllers/reauthn_required_controller_spec.rb
@@ -6,7 +6,7 @@
   describe '#confirm_recently_authenticated' do
     controller do
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
diff --git a/spec/controllers/saml_idp_controller_spec.rb b/spec/controllers/saml_idp_controller_spec.rb
index 025cf9ed02a..87bae09eea2 100644
--- a/spec/controllers/saml_idp_controller_spec.rb
+++ b/spec/controllers/saml_idp_controller_spec.rb
@@ -29,23 +29,25 @@
         )
         sign_in user
 
-        post :logout, SAMLResponse: 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4' \
-                                    '8c2FtbDJwOkxvZ291dFJlc3BvbnNlIHhtbG5zOnNhbWwycD0idX' \
-                                    'JuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnByb3RvY29sIiBEZ' \
-                                    'XN0aW5hdGlvbj0iaHR0cHM6Ly9teWFjY291bnQudXNjaXMuZGhz' \
-                                    'Lmdvdi9hcGkvc2FtbC9sb2dvdXQiIElEPSJhMzZkYWloNWNqYmo' \
-                                    'zMWI5NDYwZGJiajNqZDQ2N2I0IiBJblJlc3BvbnNlVG89Il81Zj' \
-                                    'dlYjU3MC01YjQ3LTRhMzAtYjUzNi0yY2YyOThhY2NmNmYiIElzc' \
-                                    '3VlSW5zdGFudD0iMjAxNS0xMi0wMlQxNToyNzo0OS4zNzFaIiBW' \
-                                    'ZXJzaW9uPSIyLjAiPjxzYW1sMjpJc3N1ZXIgeG1sbnM6c2FtbDI' \
-                                    '9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb2' \
-                                    '4iPmV4dGVybmFsYXBwX3ByXzMwYTwvc2FtbDI6SXNzdWVyPjxzY' \
-                                    'W1sMnA6U3RhdHVzPjxzYW1sMnA6U3RhdHVzQ29kZSBWYWx1ZT0i' \
-                                    'dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnN0YXR1czpVbmt' \
-                                    'ub3duUHJpbmNpcGFsIi8+PHNhbWwycDpTdGF0dXNNZXNzYWdlPk' \
-                                    '5vIHVzZXIgaXMgbG9nZ2VkIGluPC9zYW1sMnA6U3RhdHVzTWVzc' \
-                                    '2FnZT48L3NhbWwycDpTdGF0dXM+PC9zYW1sMnA6TG9nb3V0UmVz' \
-                                        'cG9uc2U+'
+        post :logout, params: {
+          SAMLResponse: 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4' \
+                        '8c2FtbDJwOkxvZ291dFJlc3BvbnNlIHhtbG5zOnNhbWwycD0idX' \
+                        'JuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnByb3RvY29sIiBEZ' \
+                        'XN0aW5hdGlvbj0iaHR0cHM6Ly9teWFjY291bnQudXNjaXMuZGhz' \
+                        'Lmdvdi9hcGkvc2FtbC9sb2dvdXQiIElEPSJhMzZkYWloNWNqYmo' \
+                        'zMWI5NDYwZGJiajNqZDQ2N2I0IiBJblJlc3BvbnNlVG89Il81Zj' \
+                        'dlYjU3MC01YjQ3LTRhMzAtYjUzNi0yY2YyOThhY2NmNmYiIElzc' \
+                        '3VlSW5zdGFudD0iMjAxNS0xMi0wMlQxNToyNzo0OS4zNzFaIiBW' \
+                        'ZXJzaW9uPSIyLjAiPjxzYW1sMjpJc3N1ZXIgeG1sbnM6c2FtbDI' \
+                        '9InVybjpvYXNpczpuYW1lczp0YzpTQU1MOjIuMDphc3NlcnRpb2' \
+                        '4iPmV4dGVybmFsYXBwX3ByXzMwYTwvc2FtbDI6SXNzdWVyPjxzY' \
+                        'W1sMnA6U3RhdHVzPjxzYW1sMnA6U3RhdHVzQ29kZSBWYWx1ZT0i' \
+                        'dXJuOm9hc2lzOm5hbWVzOnRjOlNBTUw6Mi4wOnN0YXR1czpVbmt' \
+                        'ub3duUHJpbmNpcGFsIi8+PHNhbWwycDpTdGF0dXNNZXNzYWdlPk' \
+                        '5vIHVzZXIgaXMgbG9nZ2VkIGluPC9zYW1sMnA6U3RhdHVzTWVzc' \
+                        '2FnZT48L3NhbWwycDpTdGF0dXM+PC9zYW1sMnA6TG9nb3V0UmVz' \
+                        'cG9uc2U+',
+        }
         expect(response).to redirect_to root_url
       end
     end
@@ -188,14 +190,15 @@
     end
 
     context 'authn_context is invalid' do
-      it 'renders nothing with a 401 error' do
+      it 'renders an error page' do
         stub_analytics
         allow(@analytics).to receive(:track_event)
 
         saml_get_auth(invalid_authn_context_settings)
 
-        expect(response.status).to eq(401)
-        expect(response.body).to be_empty
+        expect(controller).to render_template('saml_idp/auth/error')
+        expect(response.status).to eq(400)
+        expect(response.body).to include(t('errors.messages.unauthorized_authn_context'))
 
         analytics_hash = {
           success: false,
@@ -234,7 +237,7 @@
     end
 
     context 'service provider is invalid' do
-      it 'responds with a 401 Unauthorized error' do
+      it 'responds with an error page' do
         user = create(:user, :signed_up)
 
         stub_analytics
@@ -242,7 +245,9 @@
 
         generate_saml_response(user, invalid_service_provider_settings)
 
-        expect(response.status).to eq(401)
+        expect(controller).to render_template('saml_idp/auth/error')
+        expect(response.status).to eq(400)
+        expect(response.body).to include(t('errors.messages.unauthorized_service_provider'))
 
         analytics_hash = {
           success: false,
@@ -257,7 +262,7 @@
     end
 
     context 'both service provider and authn_context are invalid' do
-      it 'responds with a 401 Unauthorized error' do
+      it 'responds with an error page' do
         user = create(:user, :signed_up)
 
         stub_analytics
@@ -265,7 +270,10 @@
 
         generate_saml_response(user, invalid_service_provider_and_authn_context_settings)
 
-        expect(response.status).to eq(401)
+        expect(controller).to render_template('saml_idp/auth/error')
+        expect(response.status).to eq(400)
+        expect(response.body).to include(t('errors.messages.unauthorized_authn_context'))
+        expect(response.body).to include(t('errors.messages.unauthorized_service_provider'))
 
         analytics_hash = {
           success: false,
@@ -829,10 +837,10 @@ def stub_requested_attributes
       expect(subject).to have_actions(
         :before,
         :disable_caching,
-        [:validate_saml_request, only: :auth],
-        [:validate_service_provider_and_authn_context, only: :auth],
-        [:store_saml_request, only: :auth],
-        [:add_sp_metadata_to_session, only: :auth]
+        :validate_saml_request,
+        :validate_service_provider_and_authn_context,
+        :store_saml_request,
+        :add_sp_metadata_to_session
       )
     end
   end
diff --git a/spec/controllers/sign_up/email_confirmations_controller_spec.rb b/spec/controllers/sign_up/email_confirmations_controller_spec.rb
index 75023400d43..64afe5fd439 100644
--- a/spec/controllers/sign_up/email_confirmations_controller_spec.rb
+++ b/spec/controllers/sign_up/email_confirmations_controller_spec.rb
@@ -17,7 +17,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: nil
+      get :create, params: { confirmation_token: nil }
 
       expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
       expect(response).to redirect_to sign_up_email_resend_path
@@ -34,7 +34,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: ''
+      get :create, params: { confirmation_token: '' }
 
       expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
       expect(response).to redirect_to sign_up_email_resend_path
@@ -51,7 +51,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: "''"
+      get :create, params: { confirmation_token: "''" }
 
       expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
       expect(response).to redirect_to sign_up_email_resend_path
@@ -68,7 +68,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: '""'
+      get :create, params: { confirmation_token: '""' }
 
       expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
       expect(response).to redirect_to sign_up_email_resend_path
@@ -87,7 +87,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: 'foo'
+      get :create, params: { confirmation_token: 'foo' }
     end
 
     it 'tracks expired token' do
@@ -107,7 +107,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: 'foo'
+      get :create, params: { confirmation_token: 'foo' }
 
       expect(flash[:error]).
         to eq t('errors.messages.confirmation_period_expired', period: '24 hours')
@@ -131,7 +131,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: 'foo'
+      get :create, params: { confirmation_token: 'foo' }
     end
   end
 
@@ -157,7 +157,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_CONFIRMATION, analytics_hash)
 
-      get :create, confirmation_token: 'foo'
+      get :create, params: { confirmation_token: 'foo' }
     end
   end
 end
diff --git a/spec/controllers/sign_up/email_resend_controller_spec.rb b/spec/controllers/sign_up/email_resend_controller_spec.rb
index 555cf4e946d..6c17322a508 100644
--- a/spec/controllers/sign_up/email_resend_controller_spec.rb
+++ b/spec/controllers/sign_up/email_resend_controller_spec.rb
@@ -18,7 +18,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::EMAIL_CONFIRMATION_RESEND, result)
 
-        expect { post :create, user_params }.
+        expect { post :create, params: user_params }.
           to change { ActionMailer::Base.deliveries.count }.by(1)
 
         expect(response).to redirect_to sign_up_verify_email_path
@@ -31,7 +31,7 @@
       end
 
       it 'does not send an email and displays the same message as if the user existed' do
-        expect { post :create, @user_params }.
+        expect { post :create, params: @user_params }.
           to change { ActionMailer::Base.deliveries.count }.by(0)
 
         expect(response).to redirect_to sign_up_verify_email_path
@@ -49,7 +49,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::EMAIL_CONFIRMATION_RESEND, result)
 
-        post :create, @user_params
+        post :create, params: @user_params
       end
     end
 
@@ -69,7 +69,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::EMAIL_CONFIRMATION_RESEND, result)
 
-        expect { post :create, user_params }.
+        expect { post :create, params: user_params }.
           to change { ActionMailer::Base.deliveries.count }.by(0)
 
         expect(response).to redirect_to sign_up_verify_email_path
@@ -80,7 +80,7 @@
       it 'renders new' do
         user_params = { resend_email_confirmation_form: { email: 'a@b.' } }
 
-        post :create, user_params
+        post :create, params: user_params
 
         expect(response).to render_template(:new)
       end
@@ -92,7 +92,7 @@
 
         user_params = { resend_email_confirmation_form: { email: 'TEST@example.com ' } }
 
-        expect { post :create, user_params }.
+        expect { post :create, params: user_params }.
           to change { ActionMailer::Base.deliveries.count }.by(1)
       end
     end
diff --git a/spec/controllers/sign_up/passwords_controller_spec.rb b/spec/controllers/sign_up/passwords_controller_spec.rb
index d27ac99d0ee..441ddc69902 100644
--- a/spec/controllers/sign_up/passwords_controller_spec.rb
+++ b/spec/controllers/sign_up/passwords_controller_spec.rb
@@ -17,7 +17,10 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::PASSWORD_CREATION, analytics_hash)
 
-      post :create, password_form: { password: 'NewVal!dPassw0rd' }, confirmation_token: token
+      post :create, params: {
+        password_form: { password: 'NewVal!dPassw0rd' },
+        confirmation_token: token,
+      }
 
       user.reload
       expect(user.valid_password?('NewVal!dPassw0rd')).to eq true
@@ -40,7 +43,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::PASSWORD_CREATION, analytics_hash)
 
-      post :create, password_form: { password: 'NewVal' }, confirmation_token: token
+      post :create, params: { password_form: { password: 'NewVal' }, confirmation_token: token }
     end
   end
 end
diff --git a/spec/controllers/sign_up/registrations_controller_spec.rb b/spec/controllers/sign_up/registrations_controller_spec.rb
index 0bff308f684..b94d665ff57 100644
--- a/spec/controllers/sign_up/registrations_controller_spec.rb
+++ b/spec/controllers/sign_up/registrations_controller_spec.rb
@@ -45,7 +45,7 @@
         allow(@analytics).to receive(:track_event)
         allow(subject).to receive(:create_user_event)
 
-        post :create, user: { email: 'new@example.com' }
+        post :create, params: { user: { email: 'new@example.com' } }
 
         user = User.find_with_email('new@example.com')
 
@@ -63,7 +63,7 @@
       end
 
       it 'sets the email in the session and redirects to sign_up_verify_email_path' do
-        post :create, user: { email: 'test@test.com' }
+        post :create, params: { user: { email: 'test@test.com' } }
 
         expect(session[:email]).to eq('test@test.com')
         expect(response).to redirect_to(sign_up_verify_email_path)
@@ -73,7 +73,7 @@
         user = create(:user)
         stub_sign_in(user)
 
-        post :create, user: { email: user.email }
+        post :create, params: { user: { email: user.email } }
 
         expect(response).to redirect_to account_path
       end
@@ -95,7 +95,7 @@
         with(Analytics::USER_REGISTRATION_EMAIL, analytics_hash)
       expect(subject).to_not receive(:create_user_event)
 
-      post :create, user: { email: 'TEST@example.com ' }
+      post :create, params: { user: { email: 'TEST@example.com ' } }
     end
 
     it 'tracks unsuccessful user registration' do
@@ -111,7 +111,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::USER_REGISTRATION_EMAIL, analytics_hash)
 
-      post :create, user: { email: 'invalid@', request_id: '' }
+      post :create, params: { user: { email: 'invalid@', request_id: '' } }
     end
   end
 
@@ -122,7 +122,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::USER_REGISTRATION_INTRO_VISIT)
 
-      get :show, request_id: 'foo'
+      get :show, params: { request_id: 'foo' }
     end
 
     it 'cannot be viewed by signed in users' do
diff --git a/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb
index 035e37cfe6c..15f31702b38 100644
--- a/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb
+++ b/spec/controllers/two_factor_authentication/otp_verification_controller_spec.rb
@@ -16,7 +16,7 @@
           )
           allow(FeatureManagement).to receive(:prefill_otp_codes?).and_return(true)
 
-          get :show, otp_delivery_preference: 'sms'
+          get :show, params: { otp_delivery_preference: 'sms' }
 
           expect(assigns(:presenter).code_value).to eq(subject.current_user.direct_otp)
         end
@@ -25,7 +25,7 @@
       context 'when FeatureManagement.prefill_otp_codes? is false' do
         it 'does not set @code_value' do
           allow(FeatureManagement).to receive(:prefill_otp_codes?).and_return(false)
-          get :show, otp_delivery_preference: 'sms'
+          get :show, params: { otp_delivery_preference: 'sms' }
 
           expect(assigns(:code_value)).to be_nil
         end
@@ -46,14 +46,14 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::MULTI_FACTOR_AUTH_ENTER_OTP_VISIT, analytics_hash)
 
-      get :show, otp_delivery_preference: 'sms'
+      get :show, params: { otp_delivery_preference: 'sms' }
     end
 
     context 'when there is no session (signed out or locked out), and the user reloads the page' do
       it 'redirects to the home page' do
         expect(controller.user_session).to be_nil
 
-        get :show, otp_delivery_preference: 'sms'
+        get :show, params: { otp_delivery_preference: 'sms' }
 
         expect(response).to redirect_to(new_user_session_path)
       end
@@ -79,7 +79,7 @@
           with(Analytics::MULTI_FACTOR_AUTH, properties)
         expect(subject.current_user.reload.second_factor_attempts_count).to eq 0
 
-        post :create, code: '12345', otp_delivery_preference: 'sms'
+        post :create, params: { code: '12345', otp_delivery_preference: 'sms' }
       end
 
       it 'increments second_factor_attempts_count' do
@@ -113,7 +113,7 @@
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH, properties)
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH_MAX_ATTEMPTS)
 
-        post :create, code: '12345', otp_delivery_preference: 'sms'
+        post :create, params: { code: '12345', otp_delivery_preference: 'sms' }
       end
     end
 
@@ -125,14 +125,20 @@
       end
 
       it 'redirects to the profile' do
-        post :create, code: subject.current_user.reload.direct_otp, otp_delivery_preference: 'sms'
+        post :create, params: {
+          code: subject.current_user.reload.direct_otp,
+          otp_delivery_preference: 'sms',
+        }
 
         expect(response).to redirect_to account_path
       end
 
       it 'resets the second_factor_attempts_count' do
         subject.current_user.update(second_factor_attempts_count: 1)
-        post :create, code: subject.current_user.reload.direct_otp, otp_delivery_preference: 'sms'
+        post :create, params: {
+          code: subject.current_user.reload.direct_otp,
+          otp_delivery_preference: 'sms',
+        }
 
         expect(subject.current_user.reload.second_factor_attempts_count).to eq 0
       end
@@ -151,7 +157,10 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::MULTI_FACTOR_AUTH, properties)
 
-        post :create, code: subject.current_user.reload.direct_otp, otp_delivery_preference: 'sms'
+        post :create, params: {
+          code: subject.current_user.reload.direct_otp,
+          otp_delivery_preference: 'sms',
+        }
       end
     end
 
@@ -167,7 +176,7 @@
 
       describe 'when user submits an invalid OTP' do
         before do
-          post :create, code: '12345', otp_delivery_preference: 'sms'
+          post :create, params: { code: '12345', otp_delivery_preference: 'sms' }
         end
 
         it 'resets attempts count' do
@@ -181,7 +190,10 @@
 
       describe 'when user submits a valid OTP' do
         before do
-          post :create, code: subject.current_user.direct_otp, otp_delivery_preference: 'sms'
+          post :create, params: {
+            code: subject.current_user.direct_otp,
+            otp_delivery_preference: 'sms',
+          }
         end
 
         it 'resets attempts count' do
@@ -215,8 +227,10 @@
           before do
             post(
               :create,
-              code: subject.current_user.direct_otp,
-              otp_delivery_preference: 'sms'
+              params: {
+                code: subject.current_user.direct_otp,
+                otp_delivery_preference: 'sms',
+              }
             )
           end
 
@@ -244,7 +258,7 @@
         end
 
         context 'user enters an invalid code' do
-          before { post :create, code: '999', otp_delivery_preference: 'sms' }
+          before { post :create, params: { code: '999', otp_delivery_preference: 'sms' } }
 
           it 'does not increment second_factor_attempts_count' do
             expect(subject.current_user.reload.second_factor_attempts_count).to eq 0
@@ -293,8 +307,10 @@
           before do
             post(
               :create,
-              code: subject.current_user.direct_otp,
-              otp_delivery_preference: 'sms'
+              params: {
+                code: subject.current_user.direct_otp,
+                otp_delivery_preference: 'sms',
+              }
             )
           end
 
@@ -347,8 +363,10 @@
         before do
           post(
             :create,
-            code: subject.current_user.direct_otp,
-            otp_delivery_preference: 'sms'
+            params: {
+              code: subject.current_user.direct_otp,
+              otp_delivery_preference: 'sms',
+            }
           )
         end
 
@@ -399,7 +417,7 @@
       end
 
       context 'user enters an invalid code' do
-        before { post :create, code: '999', otp_delivery_preference: 'sms' }
+        before { post :create, params: { code: '999', otp_delivery_preference: 'sms' } }
 
         it 'does not increment second_factor_attempts_count' do
           expect(subject.current_user.reload.second_factor_attempts_count).to eq 0
diff --git a/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb
index 761234be8dd..94fd271052a 100644
--- a/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb
+++ b/spec/controllers/two_factor_authentication/personal_key_verification_controller_spec.rb
@@ -30,7 +30,7 @@
       end
 
       it 'redirects to the profile' do
-        post :create, payload
+        post :create, params: payload
 
         expect(response).to redirect_to account_path
       end
@@ -38,7 +38,7 @@
       it 'calls handle_valid_otp' do
         expect(subject).to receive(:handle_valid_otp).and_call_original
 
-        post :create, payload
+        post :create, params: payload
       end
 
       it 'tracks the valid authentication event' do
@@ -48,7 +48,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::MULTI_FACTOR_AUTH, analytics_hash)
 
-        post :create, payload
+        post :create, params: payload
       end
     end
 
@@ -68,7 +68,7 @@
       end
 
       it 'renders the show page' do
-        post :create, payload
+        post :create, params: payload
 
         expect(response).to render_template(:show)
         expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_personal_key')
@@ -90,11 +90,11 @@
       it 'calls handle_invalid_otp' do
         expect(subject).to receive(:handle_invalid_otp).and_call_original
 
-        post :create, payload
+        post :create, params: payload
       end
 
       it 're-renders the personal key entry screen' do
-        post :create, payload
+        post :create, params: payload
 
         expect(response).to render_template(:show)
         expect(flash[:error]).to eq t('devise.two_factor_authentication.invalid_personal_key')
@@ -113,7 +113,7 @@
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH, properties)
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH_MAX_ATTEMPTS)
 
-        post :create, payload
+        post :create, params: payload
       end
     end
   end
diff --git a/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb b/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb
index bed129a66c4..519dba532ac 100644
--- a/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb
+++ b/spec/controllers/two_factor_authentication/totp_verification_controller_spec.rb
@@ -13,7 +13,7 @@
         expect(subject.current_user).to receive(:authenticate_totp).and_return(true)
         expect(subject.current_user.reload.second_factor_attempts_count).to eq 0
 
-        post :create, code: generate_totp_code(@secret)
+        post :create, params: { code: generate_totp_code(@secret) }
 
         expect(response).to redirect_to account_path
       end
@@ -24,7 +24,7 @@
           attributes: { second_factor_attempts_count: 1 }
         ).call
 
-        post :create, code: generate_totp_code(@secret)
+        post :create, params: { code: generate_totp_code(@secret) }
 
         expect(subject.current_user.reload.second_factor_attempts_count).to eq 0
       end
@@ -38,7 +38,7 @@
         }
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH, attributes)
 
-        post :create, code: generate_totp_code(@secret)
+        post :create, params: { code: generate_totp_code(@secret) }
       end
     end
 
@@ -47,7 +47,7 @@
         sign_in_before_2fa
         @secret = subject.current_user.generate_totp_secret
         subject.current_user.otp_secret_key = @secret
-        post :create, code: 'abc'
+        post :create, params: { code: 'abc' }
       end
 
       it 'increments second_factor_attempts_count' do
@@ -81,7 +81,7 @@
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH, attributes)
         expect(@analytics).to receive(:track_event).with(Analytics::MULTI_FACTOR_AUTH_MAX_ATTEMPTS)
 
-        post :create, code: '12345'
+        post :create, params: { code: '12345' }
       end
     end
 
@@ -101,7 +101,7 @@
 
       describe 'when user submits an invalid TOTP' do
         before do
-          post :create, code: '12345'
+          post :create, params: { code: '12345' }
         end
 
         it 'resets attempts count' do
@@ -115,7 +115,7 @@
 
       describe 'when user submits a valid TOTP' do
         before do
-          post :create, code: generate_totp_code(@secret)
+          post :create, params: { code: generate_totp_code(@secret) }
         end
 
         it 'resets attempts count' do
@@ -131,7 +131,7 @@
     context 'when the user does not have an authenticator app enabled' do
       it 'redirects to user_two_factor_authentication_path' do
         stub_sign_in_before_2fa
-        post :create, code: '123456'
+        post :create, params: { code: '123456' }
 
         expect(response).to redirect_to user_two_factor_authentication_path
       end
diff --git a/spec/controllers/users/emails_controller_spec.rb b/spec/controllers/users/emails_controller_spec.rb
index 5084cbbdcd1..c9528d9393f 100644
--- a/spec/controllers/users/emails_controller_spec.rb
+++ b/spec/controllers/users/emails_controller_spec.rb
@@ -23,7 +23,7 @@
           email_changed: true,
         }
 
-        put :update, update_user_email_form: { email: new_email }
+        put :update, params: { update_user_email_form: { email: new_email } }
 
         expect(response).to redirect_to account_url
         expect(flash[:notice]).to eq t('devise.registrations.email_update_needs_confirmation')
@@ -48,7 +48,7 @@
           email_changed: false,
         }
 
-        put :update, update_user_email_form: { email: '' }
+        put :update, params: { update_user_email_form: { email: '' } }
 
         expect(user.reload.email).to be_present
         expect(@analytics).to have_received(:track_event).
@@ -70,7 +70,7 @@
           email_changed: true,
         }
 
-        put :update, update_user_email_form: { email: second_user.email.upcase }
+        put :update, params: { update_user_email_form: { email: second_user.email.upcase } }
 
         expect(response).to redirect_to account_url
         expect(flash[:notice]).to eq t('devise.registrations.email_update_needs_confirmation')
@@ -95,7 +95,7 @@
           email_changed: false,
         }
 
-        put :update, update_user_email_form: { email: invalid_email }
+        put :update, params: { update_user_email_form: { email: invalid_email } }
 
         expect(user.reload.email).not_to eq invalid_email
         expect(@analytics).to have_received(:track_event).
@@ -117,7 +117,7 @@
           email_changed: false,
         }
 
-        put :update, update_user_email_form: { email: user.email }
+        put :update, params: { update_user_email_form: { email: user.email } }
 
         expect(response).to redirect_to account_url
         expect(flash.keys).to be_empty
diff --git a/spec/controllers/users/passwords_controller_spec.rb b/spec/controllers/users/passwords_controller_spec.rb
index ee55ba029b9..d652dbf3f81 100644
--- a/spec/controllers/users/passwords_controller_spec.rb
+++ b/spec/controllers/users/passwords_controller_spec.rb
@@ -12,7 +12,7 @@
         allow(@analytics).to receive(:track_event)
 
         params = { password: 'salty new password' }
-        patch :update, update_user_password_form: params
+        patch :update, params: { update_user_password_form: params }
 
         expect(@analytics).to have_received(:track_event).
           with(Analytics::PASSWORD_CHANGED, success: true, errors: {})
@@ -34,7 +34,7 @@
         allow(updater).to receive(:personal_key).and_return(personal_key)
 
         params = { password: password }
-        patch :update, update_user_password_form: params
+        patch :update, params: { update_user_password_form: params }
 
         expect(flash[:personal_key]).to eq personal_key
         expect(updater).to have_received(:call)
@@ -50,7 +50,7 @@
         allow(@analytics).to receive(:track_event)
 
         params = { password: 'new' }
-        patch :update, update_user_password_form: params
+        patch :update, params: { update_user_password_form: params }
 
         errors = {
           password: [
diff --git a/spec/controllers/users/personal_keys_controller_spec.rb b/spec/controllers/users/personal_keys_controller_spec.rb
index 909b55297d5..1df96234cb8 100644
--- a/spec/controllers/users/personal_keys_controller_spec.rb
+++ b/spec/controllers/users/personal_keys_controller_spec.rb
@@ -28,7 +28,7 @@
       it 'populates the flash when resending code' do
         expect(flash[:sucess]).to be_nil
 
-        get :show, resend: true
+        get :show, params: { resend: true }
         expect(flash.now[:success]).to eq t('notices.send_code.personal_key')
       end
     end
diff --git a/spec/controllers/users/phones_controller_spec.rb b/spec/controllers/users/phones_controller_spec.rb
index 1b3cebdb118..4c15552d6d2 100644
--- a/spec/controllers/users/phones_controller_spec.rb
+++ b/spec/controllers/users/phones_controller_spec.rb
@@ -16,9 +16,11 @@
         stub_analytics
         allow(@analytics).to receive(:track_event)
 
-        put :update, user_phone_form: { phone: new_phone,
-                                        international_code: 'US',
-                                        otp_delivery_preference: 'sms' }
+        put :update, params: {
+          user_phone_form: { phone: new_phone,
+                             international_code: 'US',
+                             otp_delivery_preference: 'sms' },
+        }
       end
 
       it 'lets user know they need to confirm their new phone' do
@@ -39,9 +41,11 @@
       it 'does not delete the phone' do
         stub_sign_in(user)
 
-        put :update, user_phone_form: { phone: '',
-                                        international_code: 'US',
-                                        otp_delivery_preference: 'sms' }
+        put :update, params: {
+          user_phone_form: { phone: '',
+                             international_code: 'US',
+                             otp_delivery_preference: 'sms' },
+        }
 
         expect(user.reload.phone).to be_present
         expect(response).to render_template(:edit)
@@ -55,9 +59,11 @@
         stub_analytics
         allow(@analytics).to receive(:track_event)
 
-        put :update, user_phone_form: { phone: second_user.phone,
-                                        international_code: 'US',
-                                        otp_delivery_preference: 'sms' }
+        put :update, params: {
+          user_phone_form: { phone: second_user.phone,
+                             international_code: 'US',
+                             otp_delivery_preference: 'sms' },
+        }
       end
 
       it 'processes successfully and informs user' do
@@ -80,9 +86,11 @@
         user = build(:user, phone: '123-123-1234')
         stub_sign_in(user)
 
-        put :update, user_phone_form: { phone: invalid_phone,
-                                        international_code: 'US',
-                                        otp_delivery_preference: 'sms' }
+        put :update, params: {
+          user_phone_form: { phone: invalid_phone,
+                             international_code: 'US',
+                             otp_delivery_preference: 'sms' },
+        }
 
         expect(user.phone).not_to eq invalid_phone
         expect(response).to render_template(:edit)
@@ -93,9 +101,11 @@
       it 'redirects to profile page without any messages' do
         stub_sign_in(user)
 
-        put :update, user_phone_form: { phone: user.phone,
-                                        international_code: 'US',
-                                        otp_delivery_preference: 'sms' }
+        put :update, params: {
+          user_phone_form: { phone: user.phone,
+                             international_code: 'US',
+                             otp_delivery_preference: 'sms' },
+        }
 
         expect(response).to redirect_to account_url
         expect(flash.keys).to be_empty
diff --git a/spec/controllers/users/reset_passwords_controller_spec.rb b/spec/controllers/users/reset_passwords_controller_spec.rb
index 3d1fdda2975..392de3a96ea 100644
--- a/spec/controllers/users/reset_passwords_controller_spec.rb
+++ b/spec/controllers/users/reset_passwords_controller_spec.rb
@@ -7,7 +7,7 @@
         stub_analytics
         allow(@analytics).to receive(:track_event)
 
-        get :edit, reset_password_token: 'foo'
+        get :edit, params: { reset_password_token: 'foo' }
 
         analytics_hash = {
           success: false,
@@ -32,7 +32,7 @@
         allow(User).to receive(:with_reset_password_token).with('foo').and_return(user)
         allow(user).to receive(:reset_password_period_valid?).and_return(false)
 
-        get :edit, reset_password_token: 'foo'
+        get :edit, params: { reset_password_token: 'foo' }
 
         analytics_hash = {
           success: false,
@@ -56,7 +56,7 @@
         allow(User).to receive(:with_reset_password_token).with('foo').and_return(user)
         allow(user).to receive(:reset_password_period_valid?).and_return(true)
 
-        get :edit, reset_password_token: 'foo'
+        get :edit, params: { reset_password_token: 'foo' }
 
         expect(response).to render_template :edit
         expect(flash.keys).to be_empty
@@ -81,7 +81,7 @@
 
         params = { password: 'short', reset_password_token: raw_reset_token }
 
-        put :update, reset_password_form: params
+        put :update, params: { reset_password_form: params }
 
         analytics_hash = {
           success: false,
@@ -105,7 +105,6 @@
     context 'user submits invalid new password' do
       it 'renders edit' do
         stub_analytics
-        allow(@analytics).to receive(:track_event)
 
         raw_reset_token, db_confirmation_token =
           Devise.token_generator.generate(User, :reset_password_token)
@@ -115,10 +114,7 @@
           reset_password_token: db_confirmation_token,
           reset_password_sent_at: Time.zone.now
         )
-
-        params = { password: 'short', reset_password_token: raw_reset_token }
-        put :update, reset_password_form: params
-
+        form_params = { password: 'short', reset_password_token: raw_reset_token }
         analytics_hash = {
           success: false,
           errors: { password: ['is too short (minimum is 8 characters)'] },
@@ -127,9 +123,11 @@
           confirmed: true,
         }
 
-        expect(@analytics).to have_received(:track_event).
+        expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_PASSWORD, analytics_hash)
 
+        put :update, params: { reset_password_form: form_params }
+
         expect(response).to render_template(:edit)
       end
     end
@@ -157,7 +155,7 @@
           password = 'a really long passw0rd'
           params = { password: password, reset_password_token: raw_reset_token }
 
-          put :update, reset_password_form: params
+          put :update, params: { reset_password_form: params }
 
           analytics_hash = {
             success: true,
@@ -196,7 +194,7 @@
         password = 'a really long passw0rd'
         params = { password: password, reset_password_token: raw_reset_token }
 
-        put :update, reset_password_form: params
+        put :update, params: { reset_password_form: params }
 
         analytics_hash = {
           success: true,
@@ -235,7 +233,7 @@
         password = 'a really long passw0rd'
         params = { password: password, reset_password_token: raw_reset_token }
 
-        put :update, reset_password_form: params
+        put :update, params: { reset_password_form: params }
 
         analytics_hash = {
           success: true,
@@ -272,8 +270,11 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_EMAIL, analytics_hash)
 
-        expect { put :create, password_reset_email_form: { email: 'nonexistent@example.com' } }.
-          to_not(change { ActionMailer::Base.deliveries.count })
+        expect do
+          put :create, params: {
+            password_reset_email_form: { email: 'nonexistent@example.com' },
+          }
+        end.to_not(change { ActionMailer::Base.deliveries.count })
 
         expect(response).to redirect_to forgot_password_path
       end
@@ -297,7 +298,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_EMAIL, analytics_hash)
 
-        expect { put :create, password_reset_email_form: { email: tech_user.email } }.
+        expect { put :create, params: { password_reset_email_form: { email: tech_user.email } } }.
           to change { ActionMailer::Base.deliveries.count }.by(0)
 
         expect(response).to redirect_to forgot_password_path
@@ -322,7 +323,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_EMAIL, analytics_hash)
 
-        expect { put :create, password_reset_email_form: { email: admin.email } }.
+        expect { put :create, params: { password_reset_email_form: { email: admin.email } } }.
           to change { ActionMailer::Base.deliveries.count }.by(0)
 
         expect(response).to redirect_to forgot_password_path
@@ -346,8 +347,9 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_EMAIL, analytics_hash)
 
-        expect { put :create, password_reset_email_form: { email: 'Test@example.com' } }.
-          to change { ActionMailer::Base.deliveries.count }.by(1)
+        expect do
+          put :create, params: { password_reset_email_form: { email: 'Test@example.com' } }
+        end.to change { ActionMailer::Base.deliveries.count }.by(1)
 
         expect(response).to redirect_to forgot_password_path
       end
@@ -370,7 +372,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_EMAIL, analytics_hash)
 
-        expect { put :create, password_reset_email_form: { email: user.email } }.
+        expect { put :create, params: { password_reset_email_form: { email: user.email } } }.
           to change { ActionMailer::Base.deliveries.count }.by(1)
 
         expect(ActionMailer::Base.deliveries.last.subject).
@@ -395,7 +397,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PASSWORD_RESET_EMAIL, analytics_hash)
 
-        expect { put :create, password_reset_email_form: { email: 'foo' } }.
+        expect { put :create, params: { password_reset_email_form: { email: 'foo' } } }.
           to change { ActionMailer::Base.deliveries.count }.by(0)
 
         expect(response).to render_template :new
diff --git a/spec/controllers/users/sessions_controller_spec.rb b/spec/controllers/users/sessions_controller_spec.rb
index b981880208e..f5a30f62989 100644
--- a/spec/controllers/users/sessions_controller_spec.rb
+++ b/spec/controllers/users/sessions_controller_spec.rb
@@ -122,13 +122,10 @@
     end
 
     it 'tracks the timeout' do
+      stub_analytics
       sign_in_as_user
-      current_user = controller.current_user
 
-      analytics = instance_double(Analytics)
-      expect(Analytics).to receive(:new).
-        with(current_user, controller.request).and_return(analytics)
-      expect(analytics).to receive(:track_event).with(Analytics::SESSION_TIMED_OUT)
+      expect(@analytics).to receive(:track_event).with(Analytics::SESSION_TIMED_OUT)
 
       get :timeout
     end
@@ -148,7 +145,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_AND_PASSWORD_AUTH, analytics_hash)
 
-      post :create, user: { email: user.email.upcase, password: user.password }
+      post :create, params: { user: { email: user.email.upcase, password: user.password } }
     end
 
     it 'tracks the unsuccessful authentication for existing user' do
@@ -164,7 +161,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_AND_PASSWORD_AUTH, analytics_hash)
 
-      post :create, user: { email: user.email.upcase, password: 'invalid_password' }
+      post :create, params: { user: { email: user.email.upcase, password: 'invalid_password' } }
     end
 
     it 'tracks the authentication attempt for nonexistent user' do
@@ -178,7 +175,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_AND_PASSWORD_AUTH, analytics_hash)
 
-      post :create, user: { email: 'foo@example.com', password: 'password' }
+      post :create, params: { user: { email: 'foo@example.com', password: 'password' } }
     end
 
     it 'tracks unsuccessful authentication for locked out user' do
@@ -198,7 +195,7 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::EMAIL_AND_PASSWORD_AUTH, analytics_hash)
 
-      post :create, user: { email: user.email.upcase, password: user.password }
+      post :create, params: { user: { email: user.email.upcase, password: user.password } }
     end
 
     context 'LOA1 user' do
@@ -212,7 +209,7 @@
         expect(encrypted_key_maker).to receive(:unlock).exactly(:twice).and_call_original
         expect(EncryptedAttribute).to receive(:new_user_access_key).exactly(:once).and_call_original
 
-        post :create, user: { email: user.email.upcase, password: user.password }
+        post :create, params: { user: { email: user.email.upcase, password: user.password } }
       end
     end
 
@@ -231,7 +228,7 @@
         expect(encrypted_key_maker).to receive(:unlock).exactly(:twice).and_call_original
         expect(EncryptedAttribute).to receive(:new_user_access_key).exactly(:once).and_call_original
 
-        post :create, user: { email: user.email.upcase, password: user.password }
+        post :create, params: { user: { email: user.email.upcase, password: user.password } }
       end
 
       it 'caches unverified PII pending confirmation' do
@@ -242,7 +239,7 @@
           user: user, pii: { ssn: '1234' }
         )
 
-        post :create, user: { email: user.email.upcase, password: user.password }
+        post :create, params: { user: { email: user.email.upcase, password: user.password } }
 
         expect(controller.user_session[:decrypted_pii]).to match '1234'
       end
@@ -251,7 +248,7 @@
         user = create(:user, :signed_up)
         create(:profile, :active, :verified, user: user, pii: { ssn: '1234' })
 
-        post :create, user: { email: user.email.upcase, password: user.password }
+        post :create, params: { user: { email: user.email.upcase, password: user.password } }
 
         expect(controller.user_session[:decrypted_pii]).to match '1234'
       end
@@ -278,7 +275,7 @@
         expect(@analytics).to receive(:track_event).
           with(Analytics::PROFILE_ENCRYPTION_INVALID, profile_encryption_error)
 
-        post :create, user: { email: user.email, password: user.password }
+        post :create, params: { user: { email: user.email, password: user.password } }
 
         expect(controller.user_session[:decrypted_pii]).to be_nil
         expect(profile.reload).to_not be_active
diff --git a/spec/controllers/users/totp_setup_controller_spec.rb b/spec/controllers/users/totp_setup_controller_spec.rb
index 65674e55461..36658c8c51a 100644
--- a/spec/controllers/users/totp_setup_controller_spec.rb
+++ b/spec/controllers/users/totp_setup_controller_spec.rb
@@ -53,7 +53,7 @@
         allow(@analytics).to receive(:track_event)
 
         get :new
-        patch :confirm, code: 123
+        patch :confirm, params: { code: 123 }
       end
 
       it 'redirects with an error message' do
@@ -86,7 +86,7 @@
         allow(form).to receive(:submit).and_return(response)
 
         get :new
-        patch :confirm, code: code
+        patch :confirm, params: { code: code }
       end
 
       it 'redirects to account_path with a success message' do
diff --git a/spec/controllers/users/two_factor_authentication_controller_spec.rb b/spec/controllers/users/two_factor_authentication_controller_spec.rb
index 0683fd5e659..50bf58e0ea7 100644
--- a/spec/controllers/users/two_factor_authentication_controller_spec.rb
+++ b/spec/controllers/users/two_factor_authentication_controller_spec.rb
@@ -8,8 +8,8 @@
         :authenticate_user,
         [:require_current_password, if: :current_password_required?],
         :check_already_authenticated,
-        [:reset_attempt_count_if_user_no_longer_locked_out, only: :create],
-        [:apply_secure_headers_override, only: %i[show create]]
+        :reset_attempt_count_if_user_no_longer_locked_out,
+        :apply_secure_headers_override
       )
     end
   end
@@ -19,7 +19,7 @@
       before_action :check_already_authenticated
 
       def index
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -118,7 +118,7 @@ def index
       end
 
       it 'sends OTP via SMS' do
-        get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'sms' }
+        get :send_code, params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } }
 
         expect(SmsOtpSenderJob).to have_received(:perform_later).with(
           code: subject.current_user.direct_otp,
@@ -148,7 +148,7 @@ def index
         expect(@analytics).to receive(:track_event).
           with(Analytics::OTP_DELIVERY_SELECTION, analytics_hash)
 
-        get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'sms' }
+        get :send_code, params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } }
       end
 
       it 'calls OtpRateLimiter#exceeded_otp_send_limit? and #increment' do
@@ -159,14 +159,16 @@ def index
         expect(otp_rate_limiter).to receive(:exceeded_otp_send_limit?)
         expect(otp_rate_limiter).to receive(:increment)
 
-        get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'sms' }
+        get :send_code, params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } }
       end
 
       it 'marks the user as locked out after too many attempts' do
         expect(@user.second_factor_locked_at).to be_nil
 
         (Figaro.env.otp_delivery_blocklist_maxretry.to_i + 1).times do
-          get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'sms' }
+          get :send_code, params: {
+            otp_delivery_selection_form: { otp_delivery_preference: 'sms' },
+          }
         end
 
         expect(@user.reload.second_factor_locked_at.to_f).to be_within(0.1).of(Time.zone.now.to_f)
@@ -182,7 +184,9 @@ def index
       end
 
       it 'sends OTP via voice' do
-        get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'voice' }
+        get :send_code, params: {
+          otp_delivery_selection_form: { otp_delivery_preference: 'voice' },
+        }
 
         expect(VoiceOtpSenderJob).to have_received(:perform_later).with(
           code: subject.current_user.direct_otp,
@@ -212,7 +216,9 @@ def index
         expect(@analytics).to receive(:track_event).
           with(Analytics::OTP_DELIVERY_SELECTION, analytics_hash)
 
-        get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'voice' }
+        get :send_code, params: {
+          otp_delivery_selection_form: { otp_delivery_preference: 'voice' },
+        }
       end
     end
 
@@ -222,7 +228,9 @@ def index
       end
 
       it 'redirects user to choose a valid delivery method' do
-        get :send_code, otp_delivery_selection_form: { otp_delivery_preference: 'pigeon' }
+        get :send_code, params: {
+          otp_delivery_selection_form: { otp_delivery_preference: 'pigeon' },
+        }
 
         expect(response).to redirect_to user_two_factor_authentication_path(reauthn: false)
       end
diff --git a/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb b/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb
index 9f307f531a3..3ac54eedb50 100644
--- a/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb
+++ b/spec/controllers/users/two_factor_authentication_setup_controller_spec.rb
@@ -27,10 +27,12 @@
       expect(@analytics).to receive(:track_event).
         with(Analytics::MULTI_FACTOR_AUTH_PHONE_SETUP, result)
 
-      patch :set, user_phone_form: {
-        phone: '703-555-010',
-        otp_delivery_preference: :sms,
-        international_code: 'US',
+      patch :set, params: {
+        user_phone_form: {
+          phone: '703-555-010',
+          otp_delivery_preference: :sms,
+          international_code: 'US',
+        },
       }
 
       expect(response).to render_template(:index)
@@ -52,9 +54,11 @@
 
         patch(
           :set,
-          user_phone_form: { phone: '703-555-0100',
-                             otp_delivery_preference: 'voice',
-                             international_code: 'US' }
+          params: {
+            user_phone_form: { phone: '703-555-0100',
+                               otp_delivery_preference: 'voice',
+                               international_code: 'US' },
+          }
         )
 
         expect(response).to redirect_to(
@@ -84,9 +88,11 @@
 
         patch(
           :set,
-          user_phone_form: { phone: '703-555-0100',
-                             otp_delivery_preference: :sms,
-                             international_code: 'US' }
+          params: {
+            user_phone_form: { phone: '703-555-0100',
+                               otp_delivery_preference: :sms,
+                               international_code: 'US' },
+          }
         )
 
         expect(response).to redirect_to(
@@ -115,9 +121,11 @@
 
         patch(
           :set,
-          user_phone_form: { phone: '703-555-0100',
-                             otp_delivery_preference: :sms,
-                             international_code: 'US' }
+          params: {
+            user_phone_form: { phone: '703-555-0100',
+                               otp_delivery_preference: :sms,
+                               international_code: 'US' },
+          }
         )
 
         expect(response).to redirect_to(
diff --git a/spec/controllers/users/verify_account_controller_spec.rb b/spec/controllers/users/verify_account_controller_spec.rb
index 89e757124bf..06894fd0270 100644
--- a/spec/controllers/users/verify_account_controller_spec.rb
+++ b/spec/controllers/users/verify_account_controller_spec.rb
@@ -47,8 +47,10 @@
     subject(:action) do
       post(
         :create,
-        verify_account_form: {
-          otp: submitted_otp,
+        params: {
+          verify_account_form: {
+            otp: submitted_otp,
+          },
         }
       )
     end
diff --git a/spec/controllers/users/verify_password_controller_spec.rb b/spec/controllers/users/verify_password_controller_spec.rb
index fba5173e971..4e3f123fce0 100644
--- a/spec/controllers/users/verify_password_controller_spec.rb
+++ b/spec/controllers/users/verify_password_controller_spec.rb
@@ -66,7 +66,7 @@
         context 'with valid password' do
           before do
             allow(form).to receive(:submit).and_return(response_ok)
-            put :update, user: { password: user.password }
+            put :update, params: { user: { password: user.password } }
           end
 
           it 'redirects to the account page' do
@@ -82,7 +82,7 @@
           it 'renders the new template' do
             allow(form).to receive(:submit).and_return(response_bad)
 
-            put :update, user: { password: user.password }
+            put :update, params: { user: { password: user.password } }
 
             expect(response).to render_template(:new)
           end
diff --git a/spec/controllers/users/verify_personal_key_controller_spec.rb b/spec/controllers/users/verify_personal_key_controller_spec.rb
index d8d7698bfa3..3a500984740 100644
--- a/spec/controllers/users/verify_personal_key_controller_spec.rb
+++ b/spec/controllers/users/verify_personal_key_controller_spec.rb
@@ -55,13 +55,13 @@
       end
 
       it 'redirects to the next step of the account recovery flow' do
-        post :create, personal_key: personal_key
+        post :create, params: { personal_key: personal_key }
 
         expect(response).to redirect_to(verify_password_url)
       end
 
       it 'stores that the personal key was entered in the user session' do
-        post :create, personal_key: personal_key
+        post :create, params: { personal_key: personal_key }
 
         expect(subject.reactivate_account_session.personal_key?).to eq(true)
       end
@@ -75,7 +75,7 @@
           with(user: subject.current_user, personal_key: bad_key).
           and_return(form)
         allow(form).to receive(:submit).and_return(response_bad)
-        post :create, personal_key: bad_key
+        post :create, params: { personal_key: bad_key }
       end
 
       it 'sets an error in the flash' do
diff --git a/spec/controllers/verify/finance_controller_spec.rb b/spec/controllers/verify/finance_controller_spec.rb
index 8e90712fbcc..e3cc4010c99 100644
--- a/spec/controllers/verify/finance_controller_spec.rb
+++ b/spec/controllers/verify/finance_controller_spec.rb
@@ -41,7 +41,7 @@
     context 'when form is invalid' do
       context 'when finance_account is missing' do
         it 'renders #new' do
-          put :create, idv_finance_form: { foo: 'bar' }
+          put :create, params: { idv_finance_form: { foo: 'bar' } }
 
           expect(response).to render_template :new
           expect(flash[:warning]).to be_nil
@@ -51,7 +51,7 @@
 
       context 'when finance_type is invalid' do
         it 'renders #new with error' do
-          put :create, idv_finance_form: { finance_type: 'foo', finance_account: '123' }
+          put :create, params: { idv_finance_form: { finance_type: 'foo', finance_account: '123' } }
 
           expect(response).to render_template :new
           expect(flash[:warning]).to be_nil
@@ -61,7 +61,7 @@
 
       context 'when finance_type is ccn' do
         it 'renders verify/finance/new with error' do
-          put :create, idv_finance_form: { finance_type: 'ccn', finance_account: 'abc' }
+          put :create, params: { idv_finance_form: { finance_type: 'ccn', finance_account: 'abc' } }
 
           expect(response).to render_template :new
           expect(flash[:warning]).to be_nil
@@ -72,7 +72,9 @@
       %w[mortgage auto_loan home_equity_line].each do |finance_type|
         context "when finance_type is #{finance_type}" do
           it 'renders verify/finance_other/new with error' do
-            put :create, idv_finance_form: { finance_type: finance_type, finance_account: 'abc' }
+            put :create, params: {
+              idv_finance_form: { finance_type: finance_type, finance_account: 'abc' },
+            }
 
             expect(response).to render_template :new
             expect(flash[:warning]).to be_nil
@@ -87,7 +89,7 @@
 
         allow(Idv::FinancialsValidator).to receive(:new)
 
-        put :create, idv_finance_form: { finance_type: :ccn, ccn: '123' }
+        put :create, params: { idv_finance_form: { finance_type: :ccn, ccn: '123' } }
 
         result = {
           success: false,
@@ -103,7 +105,7 @@
 
     context 'when form is valid' do
       it 'redirects to the show page' do
-        put :create, idv_finance_form: { finance_type: :ccn, ccn: '12345678' }
+        put :create, params: { idv_finance_form: { finance_type: :ccn, ccn: '12345678' } }
 
         expect(response).to redirect_to(verify_finance_result_path)
       end
@@ -112,7 +114,7 @@
         stub_analytics
         allow(@analytics).to receive(:track_event)
 
-        put :create, idv_finance_form: { finance_type: :ccn, ccn: '12345678' }
+        put :create, params: { idv_finance_form: { finance_type: :ccn, ccn: '12345678' } }
 
         result = {
           success: true,
diff --git a/spec/controllers/verify/otp_delivery_method_controller_spec.rb b/spec/controllers/verify/otp_delivery_method_controller_spec.rb
new file mode 100644
index 00000000000..1096eb83cd5
--- /dev/null
+++ b/spec/controllers/verify/otp_delivery_method_controller_spec.rb
@@ -0,0 +1,135 @@
+require 'rails_helper'
+
+describe Verify::OtpDeliveryMethodController do
+  let(:user) { build(:user) }
+
+  before do
+    stub_verify_steps_one_and_two(user)
+    subject.idv_session.address_verification_mechanism = 'phone'
+    subject.idv_session.params[:phone] = '5555555000'
+    subject.idv_session.vendor_phone_confirmation = true
+    subject.idv_session.user_phone_confirmation = false
+  end
+
+  describe '#new' do
+    context 'user has not selected phone verification method' do
+      before do
+        subject.idv_session.address_verification_mechanism = 'usps'
+      end
+
+      it 'redirects to the review controller' do
+        get :new
+        expect(response).to redirect_to verify_review_path
+      end
+    end
+
+    context 'user has confirmed phone number' do
+      before do
+        subject.idv_session.user_phone_confirmation = true
+      end
+
+      it 'redirects to the review controller' do
+        get :new
+        expect(response).to redirect_to verify_review_path
+      end
+    end
+
+    context 'user has not completed phone step' do
+      before do
+        subject.idv_session.vendor_phone_confirmation = false
+      end
+
+      it 'redirects to the review controller' do
+        get :new
+        expect(response).to redirect_to verify_review_path
+      end
+    end
+
+    context 'user has selected phone verification and not confirmed phone' do
+      it 'renders' do
+        get :new
+        expect(response).to render_template :new
+      end
+    end
+  end
+
+  describe '#create' do
+    let(:params) do
+      {
+        otp_delivery_selection_form: {
+          otp_delivery_preference: :sms,
+        },
+      }
+    end
+
+    context 'user has not selected phone verification method' do
+      before do
+        subject.idv_session.address_verification_mechanism = 'usps'
+      end
+
+      it 'redirects to the review controller' do
+        post :create, params: params
+        expect(response).to redirect_to verify_review_path
+      end
+    end
+
+    context 'user has confirmed phone number' do
+      before do
+        subject.idv_session.user_phone_confirmation = true
+      end
+
+      it 'redirects to the review controller' do
+        post :create, params: params
+        expect(response).to redirect_to verify_review_path
+      end
+    end
+
+    context 'user has not completed phone step' do
+      before do
+        subject.idv_session.vendor_phone_confirmation = false
+      end
+
+      it 'redirects to the review controller' do
+        post :create, params: params
+        expect(response).to redirect_to verify_review_path
+      end
+    end
+
+    context 'user has selected sms' do
+      it 'redirects to the otp send path for sms' do
+        post :create, params: params
+        expect(response).to redirect_to otp_send_path(params)
+      end
+    end
+
+    context 'user has selected voice' do
+      let(:params) do
+        {
+          otp_delivery_selection_form: {
+            otp_delivery_preference: :voice,
+          },
+        }
+      end
+
+      it 'redirects to the otp send path for voice' do
+        post :create, params: params
+        expect(response).to redirect_to otp_send_path(params)
+      end
+    end
+
+    context 'form is invalid' do
+      let(:params) do
+        {
+          otp_delivery_selection_form: {
+            otp_delivery_preference: :🎷,
+          },
+        }
+      end
+
+      it 'renders the new template' do
+        post :create, params: params
+        expect(response).to render_template :new
+      end
+    end
+  end
+end
diff --git a/spec/controllers/verify/phone_controller_spec.rb b/spec/controllers/verify/phone_controller_spec.rb
index 077ee3e5167..e4065d4d754 100644
--- a/spec/controllers/verify/phone_controller_spec.rb
+++ b/spec/controllers/verify/phone_controller_spec.rb
@@ -25,9 +25,9 @@
       stub_verify_steps_one_and_two(user)
     end
 
-    context 'when the phone number is the same as the user phone' do
+    context 'when the phone number has been confirmed as user 2FA phone' do
       before do
-        subject.idv_session.params = { phone: user.phone }
+        subject.idv_session.user_phone_confirmation = true
       end
 
       it 'redirects to review when step is complete' do
@@ -38,20 +38,16 @@
       end
     end
 
-    context 'when the phone number is different from the user phone' do
+    context 'when the phone number has not been confirmed as user 2FA phone' do
       before do
-        subject.idv_session.params = { phone: bad_phone }
+        subject.idv_session.user_phone_confirmation = nil
       end
 
-      it 'redirects to phone confirmation' do
+      it 'renders the form' do
         subject.idv_session.vendor_phone_confirmation = true
         get :new
 
-        expect(response).to redirect_to redirect_to(
-          otp_send_path(
-            otp_delivery_selection_form: { otp_delivery_preference: 'sms' }
-          )
-        )
+        expect(response).to render_template :new
       end
     end
 
@@ -74,7 +70,7 @@
       end
 
       it 'renders #new' do
-        put :create, idv_phone_form: { phone: '703', international_code: 'US' }
+        put :create, params: { idv_phone_form: { phone: '703', international_code: 'US' } }
 
         expect(flash[:warning]).to be_nil
         expect(subject.idv_session.params).to be_empty
@@ -83,7 +79,7 @@
       it 'tracks form error and does not make a vendor API call' do
         expect(Idv::PhoneValidator).to_not receive(:new)
 
-        put :create, idv_phone_form: { phone: '703' }
+        put :create, params: { idv_phone_form: { phone: '703' } }
 
         result = {
           success: false,
@@ -109,7 +105,7 @@
         user = build(:user, phone: good_phone, phone_confirmed_at: Time.zone.now)
         stub_verify_steps_one_and_two(user)
 
-        put :create, idv_phone_form: { phone: good_phone, international_code: 'US' }
+        put :create, params: { idv_phone_form: { phone: good_phone, international_code: 'US' } }
 
         result = { success: true, errors: {} }
 
@@ -123,7 +119,7 @@
           user = build(:user, phone: good_phone, phone_confirmed_at: Time.zone.now)
           stub_verify_steps_one_and_two(user)
 
-          put :create, idv_phone_form: { phone: good_phone, international_code: 'US' }
+          put :create, params: { idv_phone_form: { phone: good_phone, international_code: 'US' } }
 
           expect(response).to redirect_to verify_phone_result_path
 
@@ -136,11 +132,11 @@
       end
 
       context 'when different from user phone' do
-        it 'redirects to result page and does not set phone_confirmed_at' do
+        it 'redirects to otp page and does not set phone_confirmed_at' do
           user = build(:user, phone: '+1 (415) 555-0130', phone_confirmed_at: Time.zone.now)
           stub_verify_steps_one_and_two(user)
 
-          put :create, idv_phone_form: { phone: good_phone, international_code: 'US' }
+          put :create, params: { idv_phone_form: { phone: good_phone, international_code: 'US' } }
 
           expect(response).to redirect_to verify_phone_result_path
 
@@ -257,6 +253,7 @@
         before do
           user.idv_attempts = max_attempts - 1
           user.idv_attempted_at = two_days_ago
+          subject.idv_session.user_phone_confirmation = true
         end
 
         it 'allows and does not affect attempt counter' do
@@ -278,7 +275,7 @@
           vendor_params: normalized_phone
         ).and_call_original
 
-        put :create, idv_phone_form: { phone: good_phone }
+        put :create, params: { idv_phone_form: { phone: good_phone } }
       end
     end
   end
diff --git a/spec/controllers/verify/review_controller_spec.rb b/spec/controllers/verify/review_controller_spec.rb
index dbc1d1b21bd..abc0fe7f115 100644
--- a/spec/controllers/verify/review_controller_spec.rb
+++ b/spec/controllers/verify/review_controller_spec.rb
@@ -61,7 +61,7 @@
       before_action :confirm_idv_steps_complete
 
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -105,7 +105,7 @@ def show
       before_action :confirm_idv_phone_confirmed
 
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -163,7 +163,7 @@ def show
       before_action :confirm_current_password
 
       def show
-        render text: 'Hello'
+        render plain: 'Hello'
       end
     end
 
@@ -180,7 +180,7 @@ def show
 
     context 'user does not provide password' do
       it 'redirects to new' do
-        post :show, user: { password: '' }
+        post :show, params: { user: { password: '' } }
 
         expect(flash[:error]).to eq t('idv.errors.incorrect_password')
         expect(response).to redirect_to verify_review_path
@@ -189,7 +189,7 @@ def show
 
     context 'user provides wrong password' do
       it 'redirects to new' do
-        post :show, user: { password: 'wrong' }
+        post :show, params: { user: { password: 'wrong' } }
 
         expect(flash[:error]).to eq t('idv.errors.incorrect_password')
         expect(response).to redirect_to verify_review_path
@@ -198,7 +198,7 @@ def show
 
     context 'user provides correct password' do
       it 'allows request to proceed' do
-        post :show, user: { password: ControllerHelper::VALID_PASSWORD }
+        post :show, params: { user: { password: ControllerHelper::VALID_PASSWORD } }
 
         expect(response.body).to eq 'Hello'
       end
@@ -293,7 +293,7 @@ def show
       end
 
       it 'redirects to original path' do
-        put :create, user: { password: 'wrong' }
+        put :create, params: { user: { password: 'wrong' } }
 
         expect(response).to redirect_to verify_review_path
       end
@@ -308,14 +308,14 @@ def show
       end
 
       it 'redirects to confirmation path' do
-        put :create, user: { password: ControllerHelper::VALID_PASSWORD }
+        put :create, params: { user: { password: ControllerHelper::VALID_PASSWORD } }
 
         expect(@analytics).to have_received(:track_event).with(Analytics::IDV_REVIEW_COMPLETE)
         expect(response).to redirect_to verify_confirmations_path
       end
 
       it 'creates Profile with applicant and normalized_applicant attributes' do
-        put :create, user: { password: ControllerHelper::VALID_PASSWORD }
+        put :create, params: { user: { password: ControllerHelper::VALID_PASSWORD } }
 
         profile = idv_session.profile
         uak = user.unlock_user_access_key(ControllerHelper::VALID_PASSWORD)
diff --git a/spec/controllers/verify/sessions_controller_spec.rb b/spec/controllers/verify/sessions_controller_spec.rb
index 60c93db8a4d..6620498665e 100644
--- a/spec/controllers/verify/sessions_controller_spec.rb
+++ b/spec/controllers/verify/sessions_controller_spec.rb
@@ -34,10 +34,10 @@
     it 'includes before_actions from AccountStateChecker' do
       expect(subject).to have_actions(
         :before,
-        [:confirm_two_factor_authenticated, except: :destroy],
+        :confirm_two_factor_authenticated,
         :confirm_idv_attempts_allowed,
         :confirm_idv_needed,
-        [:confirm_step_needed, except: :destroy]
+        :confirm_step_needed
       )
     end
   end
@@ -93,7 +93,7 @@
 
       context 'UUID' do
         it 'assigned user UUID to applicant' do
-          post :create, profile: user_attrs
+          post :create, params: { profile: user_attrs }
 
           expect(subject.idv_session.applicant['uuid']).to eq subject.current_user.uuid
         end
@@ -111,7 +111,7 @@
           expect(@analytics).to receive(:track_event).
             with(Analytics::IDV_BASIC_INFO_SUBMITTED_FORM, result)
 
-          post :create, profile: user_attrs.merge(ssn: '666-66-1234')
+          post :create, params: { profile: user_attrs.merge(ssn: '666-66-1234') }
 
           expect(response).to redirect_to(verify_session_dupe_path)
           expect(flash[:error]).to match t('idv.errors.duplicate_ssn')
@@ -120,7 +120,7 @@
 
       context 'empty SSN' do
         it 'renders the form' do
-          post :create, profile: user_attrs.merge(ssn: '')
+          post :create, params: { profile: user_attrs.merge(ssn: '') }
 
           expect(response).to_not redirect_to(verify_session_dupe_path)
           expect(response).to render_template(:new)
@@ -133,14 +133,14 @@
         end
 
         it 'checks for required fields' do
-          post :create, profile: partial_attrs
+          post :create, params: { profile: partial_attrs }
 
           expect(response).to render_template(:new)
           expect(flash[:warning]).to be_nil
         end
 
         it 'does not increment attempts count' do
-          expect { post :create, profile: partial_attrs }.
+          expect { post :create, params: { profile: partial_attrs } }.
             to_not change(user, :idv_attempts)
         end
       end
diff --git a/spec/features/idv/account_creation_spec.rb b/spec/features/idv/account_creation_spec.rb
index c536072cfff..5e000f78788 100644
--- a/spec/features/idv/account_creation_spec.rb
+++ b/spec/features/idv/account_creation_spec.rb
@@ -13,4 +13,14 @@
     it_behaves_like 'selecting usps address verification method', :saml
     it_behaves_like 'selecting usps address verification method', :oidc
   end
+
+  context 'choosing phone address verification otp delivery method' do
+    it_behaves_like 'idv otp delivery method selection', :saml
+    it_behaves_like 'idv otp delivery method selection', :oidc
+  end
+
+  context 'retries limited by max step attempt limits' do
+    it_behaves_like 'idv max step attempts', :saml
+    it_behaves_like 'idv max step attempts', :oidc
+  end
 end
diff --git a/spec/features/idv/flow_spec.rb b/spec/features/idv/flow_spec.rb
index 83cdb84597d..b13b4c90140 100644
--- a/spec/features/idv/flow_spec.rb
+++ b/spec/features/idv/flow_spec.rb
@@ -69,69 +69,7 @@
       expect(page).to have_css('.modal-warning', text: t('idv.modal.sessions.heading'))
     end
 
-    scenario 'allows 3 attempts in 24 hours' do
-      user = sign_in_and_2fa_user
-
-      max_attempts_less_one.times do
-        visit verify_session_path
-        complete_idv_profile_fail
-
-        expect(current_path).to eq verify_session_result_path
-      end
-
-      user.reload
-      expect(user.idv_attempted_at).to_not be_nil
-
-      visit destroy_user_session_url
-      sign_in_and_2fa_user(user)
-
-      visit verify_session_path
-      complete_idv_profile_fail
-
-      expect(page).to have_css('.alert-error', text: t('idv.modal.sessions.heading'))
-
-      visit verify_session_path
-
-      expect(page).to have_content(t('idv.errors.hardfail'))
-      expect(current_url).to eq verify_fail_url
-
-      user.reload
-      expect(user.idv_attempted_at).to_not be_nil
-    end
-
-    scenario 'finance shows failure flash message after max attempts' do
-      sign_in_and_2fa_user
-      visit verify_session_path
-      fill_out_idv_form_ok
-      click_idv_continue
-
-      max_attempts_less_one.times do
-        fill_out_financial_form_fail
-        click_idv_continue
-
-        expect(current_path).to eq verify_finance_result_path
-      end
-
-      fill_out_financial_form_fail
-      click_idv_continue
-      expect(page).to have_css('.alert-error', text: t('idv.modal.financials.heading'))
-    end
-
-    scenario 'finance shows failure modal after max attempts', js: true do
-      sign_in_and_2fa_user
-      visit verify_session_path
-      max_attempts_less_one.times do
-        fill_out_idv_form_fail
-        click_idv_continue
-        click_button t('idv.modal.button.warning')
-      end
-
-      fill_out_idv_form_fail
-      click_idv_continue
-      expect(page).to have_css('.modal-fail', text: t('idv.modal.sessions.heading'))
-    end
-
-    scenario 'successful steps are not re-entrant, but are sticky on failure', js: true do
+    scenario 'profile and financial steps are not re-entrant and are sticky on failure', :js do
       user = sign_in_and_2fa_user
 
       visit verify_session_path
@@ -173,7 +111,7 @@
       expect(page).to have_css('.modal-warning', text: t('idv.modal.financials.heading'))
       click_button t('idv.modal.button.warning')
 
-      # can't go "back" to a successful step
+      # can't go "back" to a successful profile step
       visit verify_session_path
       expect(current_path).to eq verify_finance_path
 
@@ -200,8 +138,11 @@
       fill_in :idv_finance_form_ccn, with: second_ccn_value
       click_idv_continue
 
-      # address mechanism choice
+      # can't go "back" to a successful finance step
+      visit verify_finance_path
       expect(current_path).to eq verify_address_path
+
+      # address mechanism choice
       click_idv_address_choose_phone
 
       # success advances to next step
@@ -221,6 +162,7 @@
 
       fill_out_phone_form_ok(good_phone_value)
       click_idv_continue
+      choose_idv_otp_delivery_method_sms
       enter_correct_otp_code_for_user(user)
 
       page.find('.accordion').click
@@ -236,6 +178,42 @@
       expect(page).to_not have_content(bad_phone_formatted)
     end
 
+    scenario 'phone step is re-entrant', :js do
+      phone = '+1 (555) 555-5000'
+      different_phone = '+1 (777) 777-7000'
+      user = sign_in_and_2fa_user
+
+      visit verify_session_path
+      fill_out_idv_form_ok
+      click_idv_continue
+      fill_out_financial_form_ok
+      click_idv_continue
+      click_idv_address_choose_phone
+      fill_out_phone_form_ok(phone)
+      click_idv_continue
+      choose_idv_otp_delivery_method_sms
+
+      click_link t('forms.two_factor.try_again')
+
+      expect(page.find('#idv_phone_form_phone').value).to eq(phone)
+      expect(current_path).to eq(verify_phone_path)
+
+      fill_out_phone_form_ok(different_phone)
+      click_idv_continue
+      choose_idv_otp_delivery_method_sms
+
+      # Verify that OTP confirmation can't be skipped
+      visit verify_review_path
+      expect(current_path).to eq login_two_factor_path(otp_delivery_preference: :sms)
+
+      enter_correct_otp_code_for_user(user)
+
+      page.find('.accordion').click
+
+      expect(page).to_not have_content(phone)
+      expect(page).to have_content(different_phone)
+    end
+
     scenario 'failed attempt shows flash message' do
       sign_in_and_2fa_user
       visit verify_session_path
@@ -398,6 +376,7 @@
       click_idv_address_choose_phone
       fill_out_phone_form_ok(different_phone)
       click_idv_continue
+      choose_idv_otp_delivery_method_sms
 
       click_on t('links.cancel')
 
@@ -426,11 +405,6 @@
     end
   end
 
-  def complete_idv_profile_fail
-    fill_out_idv_form_fail
-    click_button 'Continue'
-  end
-
   def click_accordion
     find('.accordion-header-controls').click
   end
diff --git a/spec/features/idv/max_attempts_spec.rb b/spec/features/idv/max_attempts_spec.rb
new file mode 100644
index 00000000000..90573a02ba3
--- /dev/null
+++ b/spec/features/idv/max_attempts_spec.rb
@@ -0,0 +1,66 @@
+require 'rails_helper'
+
+feature 'IdV max attempts' do
+  include IdvHelper
+
+  scenario 'profile shows failure modal after max attempts', :email, :idv_job, :js do
+    sign_in_and_2fa_user
+    visit verify_session_path
+
+    max_attempts_less_one.times do
+      fill_out_idv_form_fail
+      click_idv_continue
+      click_button t('idv.modal.button.warning')
+
+      expect(current_path).to eq verify_session_result_path
+    end
+
+    fill_out_idv_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.modal-fail', text: t('idv.modal.sessions.heading'))
+  end
+
+  scenario 'finance shows failure modal after max attempts', :email, :idv_job, :js do
+    sign_in_and_2fa_user
+    visit verify_session_path
+    fill_out_idv_form_ok
+    click_idv_continue
+
+    max_attempts_less_one.times do
+      fill_out_financial_form_fail
+      click_idv_continue
+      click_button t('idv.modal.button.warning')
+
+      expect(current_path).to eq verify_finance_result_path
+    end
+
+    fill_out_financial_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.modal-fail', text: t('idv.modal.financials.heading'))
+  end
+
+  scenario 'phone shows failure modal after max attempts', :email, :idv_job, :js do
+    sign_in_and_2fa_user
+    visit verify_session_path
+    fill_out_idv_form_ok
+    click_idv_continue
+    fill_out_financial_form_ok
+    click_idv_continue
+    click_idv_address_choose_phone
+
+    max_attempts_less_one.times do
+      fill_out_phone_form_fail
+      click_idv_continue
+      click_button t('idv.modal.button.warning')
+
+      expect(current_path).to eq verify_phone_result_path
+    end
+
+    fill_out_phone_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.modal-fail', text: t('idv.modal.phone.heading'))
+  end
+end
diff --git a/spec/features/idv/phone_spec.rb b/spec/features/idv/phone_spec.rb
index b8423493066..37952638786 100644
--- a/spec/features/idv/phone_spec.rb
+++ b/spec/features/idv/phone_spec.rb
@@ -3,27 +3,6 @@
 feature 'Verify phone' do
   include IdvHelper
 
-  scenario 'phone step redirects to fail after max attempts', idv_job: true do
-    sign_in_and_2fa_user
-    visit verify_session_path
-    fill_out_idv_form_ok
-    click_idv_continue
-    fill_out_financial_form_ok
-    click_idv_continue
-    click_idv_address_choose_phone
-
-    max_attempts_less_one.times do
-      fill_out_phone_form_fail
-      click_idv_continue
-
-      expect(current_path).to eq verify_phone_result_path
-    end
-
-    fill_out_phone_form_fail
-    click_idv_continue
-    expect(page).to have_css('.alert-error', text: t('idv.modal.phone.heading'))
-  end
-
   context 'Idv phone and user phone are different', idv_job: true do
     scenario 'prompts to confirm phone' do
       user = create(
@@ -69,6 +48,24 @@
       expect(SmsOtpSenderJob).to have_received(:perform_later)
       expect(page).to_not have_content(t('links.two_factor_authentication.resend_code.phone'))
     end
+
+    scenario 'user cannot re-enter phone step and change phone after confirmation', :idv_job do
+      user = sign_in_and_2fa_user
+
+      visit verify_session_path
+      fill_out_idv_form_ok
+      click_idv_continue
+      fill_out_financial_form_ok
+      click_idv_continue
+      click_idv_address_choose_phone
+      fill_out_phone_form_ok
+      click_idv_continue
+      choose_idv_otp_delivery_method_sms
+      enter_correct_otp_code_for_user(user)
+
+      visit verify_phone_path
+      expect(current_path).to eq(verify_review_path)
+    end
   end
 
   scenario 'phone field only allows numbers', js: true, idv_job: true do
@@ -109,5 +106,6 @@ def complete_idv_profile_with_phone(phone)
     click_idv_address_choose_phone
     fill_out_phone_form_ok(phone)
     click_idv_continue
+    choose_idv_otp_delivery_method_sms
   end
 end
diff --git a/spec/features/saml/loa1_sso_spec.rb b/spec/features/saml/loa1_sso_spec.rb
index 669bb18703a..8b58f505b69 100644
--- a/spec/features/saml/loa1_sso_spec.rb
+++ b/spec/features/saml/loa1_sso_spec.rb
@@ -134,6 +134,19 @@
     end
   end
 
+  context 'visiting IdP via SP, then using the language selector' do
+    it 'preserves the request_id in the url' do
+      authn_request = auth_request.create(saml_settings)
+      visit authn_request
+
+      within(:css, '.i18n-desktop-dropdown', visible: false) do
+        find_link(t('i18n.locale.es'), visible: false).click
+      end
+
+      expect(current_url).to match(%r{http://www.example.com/es/sign_up/start\?request_id=.+})
+    end
+  end
+
   context 'visiting IdP via SP, then going back to SP and visiting IdP again' do
     it 'displays the branded page' do
       authn_request = auth_request.create(saml_settings)
diff --git a/spec/forms/openid_connect_logout_form_spec.rb b/spec/forms/openid_connect_logout_form_spec.rb
index 57aae3a214c..1a385df42ed 100644
--- a/spec/forms/openid_connect_logout_form_spec.rb
+++ b/spec/forms/openid_connect_logout_form_spec.rb
@@ -114,6 +114,21 @@
             to include(t('openid_connect.logout.errors.id_token_hint'))
         end
       end
+
+      context 'with an expired, but otherwise valid id_token_hint' do
+        let(:id_token_hint) do
+          IdTokenBuilder.new(
+            identity: identity,
+            code: code,
+            custom_expiration: 5.days.ago.to_i
+          ).id_token
+        end
+
+        it 'is valid' do
+          expect(valid?).to eq(true)
+          expect(form.errors[:id_token_hint]).to be_blank
+        end
+      end
     end
 
     context 'post_logout_redirect_uri' do
diff --git a/spec/forms/otp_delivery_selection_form_spec.rb b/spec/forms/otp_delivery_selection_form_spec.rb
index e50d2687ae5..e965f0ad75a 100644
--- a/spec/forms/otp_delivery_selection_form_spec.rb
+++ b/spec/forms/otp_delivery_selection_form_spec.rb
@@ -2,7 +2,13 @@
 
 describe OtpDeliverySelectionForm do
   let(:phone_to_deliver_to) { '+1 (202) 555-1234' }
-  subject { OtpDeliverySelectionForm.new(build_stubbed(:user), phone_to_deliver_to) }
+  subject do
+    OtpDeliverySelectionForm.new(
+      build_stubbed(:user),
+      phone_to_deliver_to,
+      'authentication'
+    )
+  end
 
   describe 'otp_delivery_preference inclusion validation' do
     it 'is invalid when otp_delivery_preference is neither sms nor voice' do
@@ -21,6 +27,7 @@
           resend: true,
           country_code: '1',
           area_code: '202',
+          context: 'authentication',
         }
 
         result = instance_double(FormResponse)
@@ -40,6 +47,7 @@
           resend: nil,
           country_code: '1',
           area_code: '202',
+          context: 'authentication',
         }
 
         result = instance_double(FormResponse)
@@ -50,30 +58,56 @@
       end
     end
 
-    context 'when otp_delivery_preference is the same as the user otp_delivery_preference' do
-      it 'does not update the user' do
-        user = build_stubbed(:user, otp_delivery_preference: 'sms')
-        form = OtpDeliverySelectionForm.new(user, phone_to_deliver_to)
+    context 'with authentication context' do
+      context 'when otp_delivery_preference is the same as the user otp_delivery_preference' do
+        it 'does not update the user' do
+          user = build_stubbed(:user, otp_delivery_preference: 'sms')
+          form = OtpDeliverySelectionForm.new(user, phone_to_deliver_to, 'authentication')
 
-        expect(UpdateUser).to_not receive(:new)
+          expect(UpdateUser).to_not receive(:new)
 
-        form.submit(otp_delivery_preference: 'sms')
+          form.submit(otp_delivery_preference: 'sms')
+        end
+      end
+
+      context 'when otp_delivery_preference is different from the user otp_delivery_preference' do
+        it 'updates the user' do
+          user = build_stubbed(:user, otp_delivery_preference: 'voice')
+          form = OtpDeliverySelectionForm.new(user, phone_to_deliver_to, 'authentication')
+          attributes = { otp_delivery_preference: 'sms' }
+
+          updated_user = instance_double(UpdateUser)
+          allow(UpdateUser).to receive(:new).
+            with(user: user, attributes: attributes).and_return(updated_user)
+
+          expect(updated_user).to receive(:call)
+
+          form.submit(otp_delivery_preference: 'sms')
+        end
       end
     end
 
-    context 'when otp_delivery_preference is different from the user otp_delivery_preference' do
-      it 'updates the user' do
-        user = build_stubbed(:user, otp_delivery_preference: 'voice')
-        form = OtpDeliverySelectionForm.new(user, phone_to_deliver_to)
-        attributes = { otp_delivery_preference: 'sms' }
+    context 'with idv context' do
+      context 'when otp_delivery_preference is the same as the user otp_delivery_preference' do
+        it 'does not update the user' do
+          user = build_stubbed(:user, otp_delivery_preference: 'sms')
+          form = OtpDeliverySelectionForm.new(user, phone_to_deliver_to, 'idv')
+
+          expect(UpdateUser).to_not receive(:new)
+
+          form.submit(otp_delivery_preference: 'sms')
+        end
+      end
 
-        updated_user = instance_double(UpdateUser)
-        allow(UpdateUser).to receive(:new).
-          with(user: user, attributes: attributes).and_return(updated_user)
+      context 'when otp_delivery_preference is different from the user otp_delivery_preference' do
+        it 'does not update the user' do
+          user = build_stubbed(:user, otp_delivery_preference: 'voice')
+          form = OtpDeliverySelectionForm.new(user, phone_to_deliver_to, 'idv')
 
-        expect(updated_user).to receive(:call)
+          expect(UpdateUser).to_not receive(:new)
 
-        form.submit(otp_delivery_preference: 'sms')
+          form.submit(otp_delivery_preference: 'sms')
+        end
       end
     end
   end
diff --git a/spec/forms/verify_account_form_spec.rb b/spec/forms/verify_account_form_spec.rb
index 422bff0bef1..6efd0bc1c72 100644
--- a/spec/forms/verify_account_form_spec.rb
+++ b/spec/forms/verify_account_form_spec.rb
@@ -59,6 +59,19 @@
         expect(subject.errors[:otp]).to eq [t('errors.messages.confirmation_code_incorrect')]
       end
     end
+
+    context 'when OTP is expired' do
+      before do
+        usps_mail = double(Idv::UspsMail)
+        allow(usps_mail).to receive(:most_recent_otp_expired?).and_return(true)
+        allow(Idv::UspsMail).to receive(:new).with(user).and_return(usps_mail)
+      end
+
+      it 'is invalid' do
+        expect(subject).to_not be_valid
+        expect(subject.errors[:otp]).to eq [t('errors.messages.usps_otp_expired')]
+      end
+    end
   end
 
   describe '#submit' do
diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
index 4c753acbc9b..5a304fb87c4 100644
--- a/spec/i18n_spec.rb
+++ b/spec/i18n_spec.rb
@@ -57,7 +57,7 @@
       end
 
       it 'is formatted as normalized YAML (run scripts/normalize-yaml)' do
-        normalized_yaml = YAML.dump(YamlNormalizer.chomp_each(YAML.load_file(full_path)))
+        normalized_yaml = YAML.dump(YamlNormalizer.handle_hash(YAML.load_file(full_path)))
 
         expect(File.read(full_path)).to eq(normalized_yaml)
       end
diff --git a/spec/jobs/sms_otp_sender_job_spec.rb b/spec/jobs/sms_otp_sender_job_spec.rb
index a76fb301a4d..17b945770ab 100644
--- a/spec/jobs/sms_otp_sender_job_spec.rb
+++ b/spec/jobs/sms_otp_sender_job_spec.rb
@@ -67,13 +67,15 @@
 
     it 'sanitizes phone numbers embedded in error messages from Twilio' do
       raw_message = "The 'To' number +1 (888) 555-5555 is not a valid phone number"
+      error_code = '21211'
+      status_code = 400
       sanitized_message = "The 'To' number +# (###) ###-#### is not a valid phone number"
 
       expect_any_instance_of(TwilioService).to receive(:send_sms).
-        and_raise(Twilio::REST::RequestError.new(raw_message))
+        and_raise(Twilio::REST::RestError.new(raw_message, error_code, status_code))
 
       expect { perform }.
-        to raise_error(Twilio::REST::RequestError, sanitized_message)
+        to raise_error(Twilio::REST::RestError, sanitized_message)
     end
   end
 end
diff --git a/spec/lib/yaml_normalizer_spec.rb b/spec/lib/yaml_normalizer_spec.rb
index 3ee77d157be..6fc01e440da 100644
--- a/spec/lib/yaml_normalizer_spec.rb
+++ b/spec/lib/yaml_normalizer_spec.rb
@@ -32,7 +32,7 @@
     end
   end
 
-  describe '.chomp_each' do
+  describe '.handle_hash' do
     context 'trailing newlines' do
       let(:original) do
         {
@@ -53,7 +53,7 @@
       end
 
       it 'in-place, recursively trims trailing newlines from all strings in a hash' do
-        YamlNormalizer.chomp_each(original)
+        YamlNormalizer.handle_hash(original)
 
         expect(original).to eq(trimmed)
       end
@@ -64,7 +64,7 @@
       let(:trimmed) { { a: 'a : ', b: 'b', c: 'c : ' } }
 
       it 'trims trailing spaces, except after a colon' do
-        YamlNormalizer.chomp_each(original)
+        YamlNormalizer.handle_hash(original)
 
         expect(original).to eq(trimmed)
       end
@@ -72,10 +72,10 @@
 
     context 'leading newlines' do
       let(:original) { { a: "\n\na b c", b: "a\nb" } }
-      let(:trimmed) { { a: "a b c", b: "a\nb" } }
+      let(:trimmed) { { a: 'a b c', b: "a\nb" } }
 
       it 'trims leading newlines but not intermediate ones' do
-        YamlNormalizer.chomp_each(original)
+        YamlNormalizer.handle_hash(original)
 
         expect(original).to eq(trimmed)
       end
@@ -86,10 +86,29 @@
       let(:trimmed) { { a: nil } }
 
       it 'does not blow up' do
-        YamlNormalizer.chomp_each(original)
+        YamlNormalizer.handle_hash(original)
 
         expect(original).to eq(trimmed)
       end
     end
+
+    context 'array of hashes' do
+      let(:original) { { a: [{ b: 'b ' }] } }
+      let(:trimmed) { { a: [{ b: 'b' }] } }
+
+      it 'does not blow up' do
+        YamlNormalizer.handle_hash(original)
+
+        expect(original).to eq(trimmed)
+      end
+    end
+
+    context 'unknown object' do
+      let(:original) { { a: Object.new } }
+
+      it 'raises' do
+        expect { YamlNormalizer.handle_hash(original) }.to raise_error(ArgumentError)
+      end
+    end
   end
 end
diff --git a/spec/models/otp_requests_tracker_spec.rb b/spec/models/otp_requests_tracker_spec.rb
index 21c0f8fdde1..596f800a690 100644
--- a/spec/models/otp_requests_tracker_spec.rb
+++ b/spec/models/otp_requests_tracker_spec.rb
@@ -18,9 +18,9 @@
         expect { OtpRequestsTracker.find_or_create_with_phone(phone) }.
           to_not change(OtpRequestsTracker, :count)
         expect { OtpRequestsTracker.find_or_create_with_phone(phone) }.
-          to_not change { existing.otp_send_count }
+          to_not change(existing, :otp_send_count)
         expect { OtpRequestsTracker.find_or_create_with_phone(phone) }.
-          to_not change { existing.otp_last_sent_at }
+          to_not change(existing, :otp_last_sent_at)
       end
     end
 
diff --git a/spec/presenters/verify/otp_delivery_method_presenter_spec.rb b/spec/presenters/verify/otp_delivery_method_presenter_spec.rb
new file mode 100644
index 00000000000..f15d2775e23
--- /dev/null
+++ b/spec/presenters/verify/otp_delivery_method_presenter_spec.rb
@@ -0,0 +1,31 @@
+require 'rails_helper'
+
+describe Verify::OtpDeliveryMethodPresenter do
+  let(:phone) { '555-555-0000' }
+  let(:formatted_phone) { '+1 (555) 555-0000' }
+  let(:phone_number_capabilities) { PhoneNumberCapabilities.new(formatted_phone) }
+
+  subject { Verify::OtpDeliveryMethodPresenter.new(phone) }
+
+  before do
+    allow(PhoneNumberCapabilities).to receive(:new).
+      with(formatted_phone).
+      and_return(phone_number_capabilities)
+  end
+
+  describe '#phone_unsupported_message' do
+    it 'returns a message saying the phone is unsupported in the location' do
+      unsupported_location = '🌃🌇🏙🌇🌃'
+      allow(phone_number_capabilities).to receive(:sms_only?).and_return(true)
+      allow(phone_number_capabilities).to receive(:unsupported_location).
+        and_return(unsupported_location)
+
+      expect(subject.phone_unsupported_message).to eq(
+        t(
+          'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported',
+          location: unsupported_location
+        )
+      )
+    end
+  end
+end
diff --git a/spec/requests/constrained_route_spec.rb b/spec/requests/constrained_route_spec.rb
index f6d069d3bea..b5a1bdc7c57 100644
--- a/spec/requests/constrained_route_spec.rb
+++ b/spec/requests/constrained_route_spec.rb
@@ -2,15 +2,15 @@
 
 describe 'routes that require admin + 2FA' do
   def sign_in_user(user)
-    post_via_redirect(
+    post(
       new_user_session_path,
-      'user[email]' => user.email,
-      'user[password]' => user.password
+      params: { user: { email: user.email, password: user.password } }
     )
-    get_via_redirect otp_send_path(otp_delivery_selection_form: { otp_delivery_preference: 'sms' })
-    post_via_redirect(
-      login_two_factor_path(otp_delivery_preference: 'sms'),
-      'code' => user.reload.direct_otp
+    get otp_send_path, params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } }
+    follow_redirect!
+    post(
+      login_two_factor_path,
+      params: { otp_delivery_preference: 'sms', code: user.reload.direct_otp }
     )
   end
 
@@ -31,10 +31,9 @@ def sign_in_user(user)
       it 'prompts admin to 2FA' do
         user = create(:user, :signed_up, :admin)
 
-        post_via_redirect(
+        post(
           new_user_session_path,
-          'user[email]' => user.email,
-          'user[password]' => user.password
+          params: { user: { email: user.email, password: user.password } }
         )
 
         get endpoint
diff --git a/spec/requests/edit_user_spec.rb b/spec/requests/edit_user_spec.rb
index a99554e7639..c5abd13d731 100644
--- a/spec/requests/edit_user_spec.rb
+++ b/spec/requests/edit_user_spec.rb
@@ -11,26 +11,22 @@ def user_session
   end
 
   def sign_in_as_a_valid_user
-    post_via_redirect(
-      new_user_session_path,
-      'user[email]' => user.email,
-      'user[password]' => user.password
-    )
-    get_via_redirect otp_send_path(otp_delivery_selection_form: { otp_delivery_preference: 'sms' })
-    post_via_redirect(
-      login_two_factor_path(otp_delivery_preference: 'sms'),
-      'code' => user.reload.direct_otp
-    )
+    post new_user_session_path, params: { user: { email: user.email, password: user.password } }
+    get otp_send_path, params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } }
+    follow_redirect!
+    post login_two_factor_path, params: {
+      otp_delivery_preference: 'sms', code: user.reload.direct_otp
+    }
   end
 
   context 'user changes email address' do
     before do
       sign_in_as_a_valid_user
-      put_via_redirect manage_email_path, update_user_email_form: { email: 'new_email@example.com' }
+      put manage_email_path, params: { update_user_email_form: { email: 'new_email@example.com' } }
     end
 
     it 'displays a notice informing the user their email has been confirmed when user confirms' do
-      get_via_redirect parse_email_for_link(last_email, /confirmation_token/)
+      get parse_email_for_link(last_email, /confirmation_token/)
 
       expect(flash[:notice]).to eq t('devise.confirmations.confirmed')
       expect(response).to render_template('user_mailer/email_changed')
@@ -42,12 +38,12 @@ def sign_in_as_a_valid_user
       expect(EmailNotifier).to receive(:new).with(user).and_return(notifier)
       expect(notifier).to receive(:send_email_changed_email)
 
-      get_via_redirect parse_email_for_link(last_email, /confirmation_token/)
+      get parse_email_for_link(last_email, /confirmation_token/)
     end
 
     it 'confirms email when user clicks link in email while signed out' do
-      delete_via_redirect destroy_user_session_path
-      get_via_redirect parse_email_for_link(last_email, /confirmation_token/)
+      delete destroy_user_session_path
+      get parse_email_for_link(last_email, /confirmation_token/)
 
       expect(flash[:notice]).to eq t('devise.confirmations.confirmed')
     end
diff --git a/spec/requests/openid_connect_cors_spec.rb b/spec/requests/openid_connect_cors_spec.rb
index fa622c0dbdb..298126244cd 100644
--- a/spec/requests/openid_connect_cors_spec.rb
+++ b/spec/requests/openid_connect_cors_spec.rb
@@ -3,7 +3,7 @@
 RSpec.describe 'CORS headers for OpenID Connect endpoints' do
   describe 'configuration endpoint' do
     it 'sets CORS headers to allow all origins' do
-      get openid_connect_configuration_path, nil, 'HTTP_ORIGIN' => 'https://example.com'
+      get openid_connect_configuration_path, headers: { 'HTTP_ORIGIN' => 'https://example.com' }
 
       aggregate_failures do
         expect(response['Access-Control-Allow-Origin']).to eq('https://example.com')
@@ -14,7 +14,7 @@
 
   describe 'certs endpoint' do
     it 'sets CORS headers to allow all origins' do
-      get api_openid_connect_certs_path, nil, 'HTTP_ORIGIN' => 'https://example.com'
+      get api_openid_connect_certs_path, headers: { 'HTTP_ORIGIN' => 'https://example.com' }
 
       aggregate_failures do
         expect(response).to be_ok
@@ -26,7 +26,7 @@
 
   describe 'token endpoint' do
     it 'responds to POST requests with the right CORS headers' do
-      post api_openid_connect_token_path, nil, 'HTTP_ORIGIN' => 'https://example.com'
+      post api_openid_connect_token_path, headers: { 'HTTP_ORIGIN' => 'https://example.com' }
 
       aggregate_failures do
         expect(response).to_not be_not_found
@@ -37,12 +37,16 @@
     end
 
     it 'responds to OPTIONS requests with the right CORS headers' do
-      reset!
-      integration_session.__send__ :process, 'OPTIONS', api_openid_connect_token_path, nil,
-                                   'HTTP_ORIGIN' => 'https://example.com'
+      process(
+        :options,
+        api_openid_connect_token_path,
+        params: {},
+        headers: { 'HTTP_ORIGIN' => 'https://example.com' }
+      )
 
       aggregate_failures do
         expect(response).to be_ok
+        expect(response.body).to be_empty
         expect(response['Access-Control-Allow-Credentials']).to eq('true')
         expect(response['Access-Control-Allow-Methods']).to eq('POST, OPTIONS')
         expect(response['Access-Control-Allow-Origin']).to eq('https://example.com')
@@ -52,7 +56,7 @@
 
   describe 'userinfo endpoint' do
     it 'sets CORS headers to allow all origins' do
-      get api_openid_connect_userinfo_path, nil, 'HTTP_ORIGIN' => 'https://example.com'
+      get api_openid_connect_userinfo_path, headers: { 'HTTP_ORIGIN' => 'https://example.com' }
 
       aggregate_failures do
         expect(response).to_not be_not_found
diff --git a/spec/requests/rack_attack_spec.rb b/spec/requests/rack_attack_spec.rb
index 089245d4fc5..1328021f04c 100644
--- a/spec/requests/rack_attack_spec.rb
+++ b/spec/requests/rack_attack_spec.rb
@@ -17,7 +17,7 @@ def app
 
   describe 'high requests per ip' do
     it 'reads the limit and period from ENV vars' do
-      get '/', {}, 'REMOTE_ADDR' => '1.2.3.4'
+      get '/', params: {}, headers: { 'REMOTE_ADDR' => '1.2.3.4' }
 
       data = {
         count: 1,
@@ -31,7 +31,7 @@ def app
     context 'when the number of requests is lower than the limit' do
       it 'does not throttle' do
         2.times do
-          get '/', {}, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+          get '/', params: {}, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         end
 
         expect(last_response.status).to_not eq(429)
@@ -41,7 +41,7 @@ def app
     context 'when the request is for an asset' do
       it 'does not throttle' do
         4.times do
-          get '/assets/application.js', {}, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+          get '/assets/application.js', params: {}, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         end
 
         expect(last_response.status).to_not eq(429)
@@ -53,7 +53,7 @@ def app
         allow(Rails.logger).to receive(:warn)
 
         4.times do
-          get '/', {}, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+          get '/', params: {}, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         end
       end
 
@@ -85,7 +85,13 @@ def app
 
   describe 'logins per ip' do
     it 'reads the limit and period from ENV vars' do
-      post '/', { user: { email: 'test@example.com' } }, 'REMOTE_ADDR' => '1.2.3.4'
+      post(
+        '/',
+        params: {
+          user: { email: 'test@example.com' },
+        },
+        headers: { 'REMOTE_ADDR' => '1.2.3.4' }
+      )
 
       data = {
         count: 1,
@@ -98,7 +104,9 @@ def app
 
     it 'uses an exponential backoff' do
       3.times do
-        post '/', { user: { email: 'test@example.com' } }, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+        post '/', params: {
+          user: { email: 'test@example.com' },
+        }, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         Timecop.travel(120.seconds)
       end
 
@@ -118,7 +126,9 @@ def app
     context 'when the number of requests is lower than the limit' do
       it 'does not throttle' do
         2.times do
-          post '/', { user: { email: 'test@example.com' } }, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+          post '/', params: {
+            user: { email: 'test@example.com' },
+          }, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         end
 
         expect(last_response.status).to_not eq(429)
@@ -130,7 +140,7 @@ def app
         expect(Rails.logger).to_not receive(:warn)
 
         3.times do
-          get '/', {}, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+          get '/', params: {}, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         end
       end
     end
@@ -140,7 +150,9 @@ def app
         allow(Rails.logger).to receive(:warn)
 
         3.times do
-          post '/', { user: { email: 'test@example.com' } }, 'HTTP_X_FORWARDED_FOR' => '1.2.3.4'
+          post '/', params: {
+            user: { email: 'test@example.com' },
+          }, headers: { 'HTTP_X_FORWARDED_FOR' => '1.2.3.4' }
         end
       end
 
@@ -192,14 +204,16 @@ def app
       # sign in with first user and have them trigger the throttle
       post(
         new_user_session_path,
-        'user[email]' => user.email,
-        'user[password]' => user.password
+        params: {
+          'user[email]' => user.email,
+          'user[password]' => user.password,
+        }
       )
 
       get(
         '/otp/send',
-        { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } },
-        'REMOTE_ADDR' => '1.2.3.4'
+        params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } },
+        headers: { 'REMOTE_ADDR' => '1.2.3.4' }
       )
 
       expect(last_response.status).to eq 302
@@ -207,8 +221,8 @@ def app
       over_maxretry_limit.times do
         get(
           '/otp/send',
-          { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } },
-          'REMOTE_ADDR' => '1.2.3.4'
+          params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } },
+          headers: { 'REMOTE_ADDR' => '1.2.3.4' }
         )
       end
 
@@ -229,14 +243,16 @@ def app
       # on the phone number
       post(
         new_user_session_path,
-        'user[email]' => second_user_with_same_number.email,
-        'user[password]' => second_user_with_same_number.password
+        params: {
+          'user[email]' => second_user_with_same_number.email,
+          'user[password]' => second_user_with_same_number.password,
+        }
       )
 
       get(
         '/otp/send',
-        { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } },
-        'REMOTE_ADDR' => '1.2.3.5'
+        params: { otp_delivery_selection_form: { otp_delivery_preference: 'sms' } },
+        headers: { 'REMOTE_ADDR' => '1.2.3.5' }
       )
 
       analytics_hash = {
diff --git a/spec/services/idv/usps_mail_spec.rb b/spec/services/idv/usps_mail_spec.rb
index 576a952ec1e..7c4540a7b2a 100644
--- a/spec/services/idv/usps_mail_spec.rb
+++ b/spec/services/idv/usps_mail_spec.rb
@@ -44,4 +44,30 @@
       end
     end
   end
+
+  describe '#most_recent_otp_expired?' do
+    context 'when no mail has been sent' do
+      it 'returns false' do
+        expect(subject.most_recent_otp_expired?).to eq false
+      end
+    end
+
+    context 'when the most recent mail was sent less than 10 days ago' do
+      it 'returns false' do
+        Event.create(event_type: :usps_mail_sent, user: user, updated_at: 5.days.ago)
+        Event.create(event_type: :usps_mail_sent, user: user, updated_at: 12.days.ago)
+
+        expect(subject.most_recent_otp_expired?).to eq false
+      end
+    end
+
+    context 'when the most recent mail was sent more than 10 days ago' do
+      it 'returns true' do
+        Event.create(event_type: :usps_mail_sent, user: user, updated_at: 11.days.ago)
+        Event.create(event_type: :usps_mail_sent, user: user, updated_at: 12.days.ago)
+
+        expect(subject.most_recent_otp_expired?).to eq true
+      end
+    end
+  end
 end
diff --git a/spec/support/features/idv_helper.rb b/spec/support/features/idv_helper.rb
index ebb40023a86..0332cb15efd 100644
--- a/spec/support/features/idv_helper.rb
+++ b/spec/support/features/idv_helper.rb
@@ -75,6 +75,22 @@ def click_idv_address_choose_usps
     click_link t('idv.buttons.activate_by_mail')
   end
 
+  def choose_idv_otp_delivery_method_sms
+    page.find(
+      'label',
+      text: t('devise.two_factor_authentication.otp_delivery_preference.sms')
+    ).click
+    click_on t('idv.buttons.send_confirmation_code')
+  end
+
+  def choose_idv_otp_delivery_method_voice
+    page.find(
+      'label',
+      text: t('devise.two_factor_authentication.otp_delivery_preference.voice')
+    ).click
+    click_on t('idv.buttons.send_confirmation_code')
+  end
+
   def click_idv_cancel_modal
     within('.modal') do
       click_on t('idv.buttons.cancel')
diff --git a/spec/support/idv_examples/max_attempts.rb b/spec/support/idv_examples/max_attempts.rb
new file mode 100644
index 00000000000..278b487e32c
--- /dev/null
+++ b/spec/support/idv_examples/max_attempts.rb
@@ -0,0 +1,100 @@
+shared_examples 'idv max step attempts' do |sp|
+  it 'allows 3 attempts in 24 hours', :email do
+    visit_idp_from_sp_with_loa3(sp)
+    user = register_user
+
+    max_attempts_less_one.times do
+      visit verify_session_path
+      fill_out_idv_form_fail
+      click_idv_continue
+
+      expect(current_path).to eq verify_session_result_path
+    end
+
+    user.reload
+    expect(user.idv_attempted_at).to_not be_nil
+
+    fill_out_idv_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.alert-error', text: t('idv.modal.sessions.heading'))
+
+    visit_idp_from_sp_with_loa3(sp)
+    expect(page).to have_content(t('idv.messages.hardfail'))
+    expect(current_url).to eq verify_fail_url
+
+    visit verify_session_path
+    expect(page).to have_content(t('idv.errors.hardfail'))
+    expect(current_url).to eq verify_fail_url
+
+    user.reload
+    expect(user.idv_attempted_at).to_not be_nil
+  end
+
+  scenario 'profile shows failure flash message after max attempts', :email do
+    visit_idp_from_sp_with_loa3(sp)
+    register_user
+
+    click_idv_begin
+
+    max_attempts_less_one.times do
+      fill_out_idv_form_fail
+      click_idv_continue
+
+      expect(current_path).to eq verify_session_result_path
+    end
+
+    fill_out_idv_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.alert-error', text: t('idv.modal.sessions.heading'))
+    expect(current_path).to eq verify_session_result_path
+  end
+
+  scenario 'fincance shows failure flash message after max attempts', :email do
+    visit_idp_from_sp_with_loa3(sp)
+    register_user
+
+    click_idv_begin
+    fill_out_idv_form_ok
+    click_idv_continue
+
+    max_attempts_less_one.times do
+      fill_out_financial_form_fail
+      click_idv_continue
+
+      expect(current_path).to eq verify_finance_result_path
+    end
+
+    fill_out_financial_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.alert-error', text: t('idv.modal.financials.heading'))
+    expect(current_path).to eq verify_finance_result_path
+  end
+
+  scenario 'phone shows failure flash after max attempts', :email do
+    visit_idp_from_sp_with_loa3(sp)
+    register_user
+
+    click_idv_begin
+    fill_out_idv_form_ok
+    click_idv_continue
+    fill_out_financial_form_ok
+    click_idv_continue
+    click_idv_address_choose_phone
+
+    max_attempts_less_one.times do
+      fill_out_phone_form_fail
+      click_idv_continue
+
+      expect(current_path).to eq verify_phone_result_path
+    end
+
+    fill_out_phone_form_fail
+    click_idv_continue
+
+    expect(page).to have_css('.alert-error', text: t('idv.modal.phone.heading'))
+    expect(current_path).to eq verify_phone_result_path
+  end
+end
diff --git a/spec/support/idv_examples/otp_delivery_method.rb b/spec/support/idv_examples/otp_delivery_method.rb
new file mode 100644
index 00000000000..5a60f7dbc36
--- /dev/null
+++ b/spec/support/idv_examples/otp_delivery_method.rb
@@ -0,0 +1,67 @@
+shared_examples 'idv otp delivery method selection' do |sp|
+  let(:phone) { '555-123-4567' }
+
+  before do
+    visit_idp_from_sp_with_loa3(sp)
+    register_user
+    click_idv_begin
+    fill_out_idv_form_ok
+    click_idv_continue
+    fill_out_financial_form_ok
+    click_idv_continue
+    click_idv_address_choose_phone
+    fill_out_phone_form_ok(phone)
+    click_idv_continue
+  end
+
+  scenario 'selecting sms delivery method sends sems', :email do
+    allow(SmsOtpSenderJob).to receive(:perform_later)
+    choose_idv_otp_delivery_method_sms
+
+    expect(SmsOtpSenderJob).to have_received(:perform_later)
+    expect(current_path).to eq login_two_factor_path(otp_delivery_preference: :sms)
+  end
+
+  scenario 'selecting voice delivery method sends voice call', :email do
+    allow(VoiceOtpSenderJob).to receive(:perform_later)
+    choose_idv_otp_delivery_method_voice
+
+    expect(VoiceOtpSenderJob).to have_received(:perform_later)
+    expect(current_path).to eq login_two_factor_path(otp_delivery_preference: :voice)
+  end
+
+  scenario 'choosing to enter a different phone sends an OTP to that phone', :email do
+    different_phone = '9876543210'
+
+    choose_idv_otp_delivery_method_sms
+    click_link t('forms.two_factor.try_again')
+
+    expect(current_path).to eq verify_phone_path
+
+    fill_out_phone_form_ok(different_phone)
+    click_idv_continue
+
+    allow(SmsOtpSenderJob).to receive(:perform_later)
+    choose_idv_otp_delivery_method_sms
+
+    expect(SmsOtpSenderJob).to have_received(:perform_later).
+      with(hash_including(phone: different_phone))
+  end
+
+  context 'with a phone number that does not support voice calling' do
+    let(:phone) { '671-555-5000' }
+
+    scenario 'voice call option is disabled', :email do
+      voice_radio_button = page.find(
+        '#otp_delivery_selection_form_otp_delivery_preference_voice',
+        visible: false
+      )
+
+      expect(voice_radio_button.disabled?).to eq(true)
+      expect(page).to have_content t(
+        'devise.two_factor_authentication.otp_delivery_preference.phone_unsupported',
+        location: 'Guam'
+      )
+    end
+  end
+end
diff --git a/spec/support/idv_examples/usps_verification.rb b/spec/support/idv_examples/usps_verification.rb
index 821499e9d32..e60db3c14d8 100644
--- a/spec/support/idv_examples/usps_verification.rb
+++ b/spec/support/idv_examples/usps_verification.rb
@@ -1,21 +1,17 @@
 shared_examples 'signing in with pending USPS verification' do |sp|
-  it 'prompts for confirmation code at sign in' do
-    otp = 'abc123'
-    profile = create(
+  let(:otp) { 'abc123' }
+  let(:profile) do
+    create(
       :profile,
       deactivation_reason: :verification_pending,
       phone_confirmed: false,
       pii: { otp: otp, ssn: '123-45-6789', dob: '1970-01-01' }
     )
-    user = profile.user
-
-    visit_idp_from_sp_with_loa3(sp)
+  end
+  let(:user) { profile.user }
 
-    if %i[saml oidc].include?(sp)
-      sign_in_via_branded_page(user)
-    else
-      sign_in_live_with_2fa(user)
-    end
+  it 'prompts for confirmation code at sign in' do
+    sign_in_from_sp(sp)
 
     expect(current_path).to eq verify_account_path
     expect(page).to have_content t('idv.messages.usps.resend')
@@ -42,4 +38,31 @@
       expect(current_path).to eq account_path
     end
   end
+
+  it 'renders an error for an expired USPS OTP' do
+    sign_in_from_sp(sp)
+
+    Event.create(event_type: :usps_mail_sent, user: user, updated_at: 11.days.ago)
+
+    fill_in t('forms.verify_profile.name'), with: otp
+    click_button t('forms.verify_profile.submit')
+
+    expect(current_path).to eq verify_account_path
+    expect(page).to have_content t('errors.messages.usps_otp_expired')
+
+    user.reload
+
+    expect(user.events.account_verified.size).to eq 0
+    expect(user.active_profile).to be_nil
+  end
+
+  def sign_in_from_sp(sp)
+    visit_idp_from_sp_with_loa3(sp)
+
+    if %i[saml oidc].include?(sp)
+      sign_in_via_branded_page(user)
+    else
+      sign_in_live_with_2fa(user)
+    end
+  end
 end
diff --git a/spec/support/matchers/have_actions.rb b/spec/support/matchers/have_actions.rb
index 176b06c2796..99a512e03c6 100644
--- a/spec/support/matchers/have_actions.rb
+++ b/spec/support/matchers/have_actions.rb
@@ -12,8 +12,10 @@
 # The first parameter passed to the `have_action` method is the kind of action,
 # such as :before for `before_action`. The rest of the parameters represent an
 # array of the expected actions.
-# If any of the actions have only: or except: options, such as:
-# before_action :check_already_authenticated, only: :new,
+# If any of the actions have if:, only:, or except: options that point to custom
+# methods (i.e. not the default :create, :new, :edit, :update, and :destroy),
+# such as:
+# before_action :require_current_password, if: :current_password_required?,
 # you can test it like this:
 #
 # it 'includes the appropriate before_actions' do
@@ -21,7 +23,7 @@
 #     :before,
 #     :authenticate_user,
 #     :handle_two_factor_authentication,
-#     [:check_already_authenticated, only: :new]
+#     [:require_current_password, if: :current_password_required?]
 #   )
 # end
 
@@ -41,11 +43,13 @@
 end
 
 def action_has_only_option?(action)
-  if_option_for(action).present?
+  if_option = if_option_for(action)
+  if_option.present? && !if_option.first.is_a?(Proc)
 end
 
 def action_has_except_option?(action)
-  unless_option_for(action).present?
+  unless_option = unless_option_for(action)
+  unless_option.present? && !unless_option.first.is_a?(Proc)
 end
 
 def if_option_for(action)
diff --git a/spec/support/saml_auth_helper.rb b/spec/support/saml_auth_helper.rb
index 4f53f848695..9a80b177ce6 100644
--- a/spec/support/saml_auth_helper.rb
+++ b/spec/support/saml_auth_helper.rb
@@ -158,7 +158,7 @@ def generate_saml_response(user, settings = saml_settings)
 
   def saml_get_auth(settings)
     # GET redirect binding Authn Request
-    get(:auth, SAMLRequest: URI.decode(saml_request(settings)))
+    get :auth, params: { SAMLRequest: URI.decode(saml_request(settings)) }
   end
 
   private
diff --git a/spec/svg_spec.rb b/spec/svg_spec.rb
index 8030c85cc06..556f2695b40 100644
--- a/spec/svg_spec.rb
+++ b/spec/svg_spec.rb
@@ -1,9 +1,11 @@
 require 'rails_helper'
 
 RSpec.describe 'SVG files' do
-  Dir[Rails.root.join('**', '*.svg')].each do |svg_path|
+  Dir[Rails.root.join('**', '*.svg')].reject { |f| f.include?('node_modules') }.each do |svg_path|
     relative_path = svg_path.sub(Rails.root.to_s, '')
 
+    next if %w[vendor node_modules].include?(relative_path.split('/')[1])
+
     describe relative_path do
       it 'does not contain inline style tags (that render poorly in IE due to CSP)' do
         doc = Nokogiri::XML(File.read(svg_path))
diff --git a/spec/view_models/verify/base_spec.rb b/spec/view_models/verify/base_spec.rb
index a5dcd367dc8..497b3275899 100644
--- a/spec/view_models/verify/base_spec.rb
+++ b/spec/view_models/verify/base_spec.rb
@@ -1,28 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe Verify::Base do
-  describe '#mock_vendor_partial' do
-    context 'idv vendor is mock' do
-      it 'returns no pii warning partial' do
-        allow(Figaro.env).to receive(:proofing_vendors).and_return('mock')
-
-        partial = Verify::Base.new(remaining_attempts: 1, idv_form: nil).mock_vendor_partial
-
-        expect(partial).to eq 'verify/sessions/no_pii_warning'
-      end
-    end
-
-    context 'idv vendor is not mock' do
-      it 'returns null partial' do
-        allow(Figaro.env).to receive(:proofing_vendors).and_return('other')
-
-        partial = Verify::Base.new(remaining_attempts: 1, idv_form: nil).mock_vendor_partial
-
-        expect(partial).to eq 'shared/null'
-      end
-    end
-  end
-
   describe '#message' do
     let(:timed_out) { false }
     let(:view_model) do
diff --git a/spec/views/layouts/application.html.slim_spec.rb b/spec/views/layouts/application.html.slim_spec.rb
index dd18a895ea4..848c5c162fe 100644
--- a/spec/views/layouts/application.html.slim_spec.rb
+++ b/spec/views/layouts/application.html.slim_spec.rb
@@ -57,6 +57,17 @@
     end
   end
 
+  context '<title>' do
+    it 'does not double-escape HTML in the title tag' do
+      view.title("Something with 'single quotes'")
+
+      render
+
+      doc = Nokogiri::HTML(rendered)
+      expect(doc.at_css('title').text).to eq("login.gov - Something with 'single quotes'")
+    end
+  end
+
   context 'session expiration' do
     it 'renders a javascript page refresh' do
       allow(view).to receive(:user_fully_authenticated?).and_return(false)
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.eot b/vendor/assets/fonts/merriweather-bold-webfont.eot
deleted file mode 100755
index c77b53bdd0c..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.ttf b/vendor/assets/fonts/merriweather-bold-webfont.ttf
deleted file mode 100755
index 44f33c239f2..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.woff b/vendor/assets/fonts/merriweather-bold-webfont.woff
deleted file mode 100755
index a728400d5fd..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-bold-webfont.woff2 b/vendor/assets/fonts/merriweather-bold-webfont.woff2
deleted file mode 100755
index ff3bddfbd91..00000000000
Binary files a/vendor/assets/fonts/merriweather-bold-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.eot b/vendor/assets/fonts/merriweather-italic-webfont.eot
deleted file mode 100755
index 8841854416f..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.ttf b/vendor/assets/fonts/merriweather-italic-webfont.ttf
deleted file mode 100755
index 3180e526d96..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.woff b/vendor/assets/fonts/merriweather-italic-webfont.woff
deleted file mode 100755
index d7071e3c233..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-italic-webfont.woff2 b/vendor/assets/fonts/merriweather-italic-webfont.woff2
deleted file mode 100755
index f8660d06ff5..00000000000
Binary files a/vendor/assets/fonts/merriweather-italic-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.eot b/vendor/assets/fonts/merriweather-light-webfont.eot
deleted file mode 100755
index 4115d282bbe..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.ttf b/vendor/assets/fonts/merriweather-light-webfont.ttf
deleted file mode 100755
index 03cfa425339..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.woff b/vendor/assets/fonts/merriweather-light-webfont.woff
deleted file mode 100755
index 9b3427536d9..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-light-webfont.woff2 b/vendor/assets/fonts/merriweather-light-webfont.woff2
deleted file mode 100755
index e53e4b531ec..00000000000
Binary files a/vendor/assets/fonts/merriweather-light-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.eot b/vendor/assets/fonts/merriweather-regular-webfont.eot
deleted file mode 100755
index c4cde6d0159..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.ttf b/vendor/assets/fonts/merriweather-regular-webfont.ttf
deleted file mode 100755
index 3889a606587..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.woff b/vendor/assets/fonts/merriweather-regular-webfont.woff
deleted file mode 100755
index 1969d2ed0da..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/merriweather-regular-webfont.woff2 b/vendor/assets/fonts/merriweather-regular-webfont.woff2
deleted file mode 100755
index 3023ce73c87..00000000000
Binary files a/vendor/assets/fonts/merriweather-regular-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.eot b/vendor/assets/fonts/sourcesanspro-bold-webfont.eot
deleted file mode 100644
index f031b206e42..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf b/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf
deleted file mode 100644
index 02ae55e6e71..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff
deleted file mode 100644
index 1985bc0f19a..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2
deleted file mode 100644
index 59cbda51993..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-bold-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.eot b/vendor/assets/fonts/sourcesanspro-italic-webfont.eot
deleted file mode 100644
index e01ae4de040..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf b/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf
deleted file mode 100644
index b513caef9b0..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff
deleted file mode 100644
index a512221ddaa..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2
deleted file mode 100644
index c1a6d9f1e8a..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-italic-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.eot b/vendor/assets/fonts/sourcesanspro-light-webfont.eot
deleted file mode 100644
index 55d1c876c9b..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.ttf b/vendor/assets/fonts/sourcesanspro-light-webfont.ttf
deleted file mode 100644
index a4c674a00f9..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.woff b/vendor/assets/fonts/sourcesanspro-light-webfont.woff
deleted file mode 100644
index eb2fd5ae65c..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-light-webfont.woff2
deleted file mode 100644
index 091b8079af7..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-light-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.eot b/vendor/assets/fonts/sourcesanspro-regular-webfont.eot
deleted file mode 100644
index cddebbca5f3..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.eot and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf b/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf
deleted file mode 100644
index ac42fa1c241..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.ttf and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff
deleted file mode 100644
index e057c48e84e..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff and /dev/null differ
diff --git a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 b/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2
deleted file mode 100644
index 43ec601dc2c..00000000000
Binary files a/vendor/assets/fonts/sourcesanspro-regular-webfont.woff2 and /dev/null differ
diff --git a/vendor/assets/stylesheets/basscss/_margin.scss b/vendor/assets/stylesheets/basscss/_margin.scss
deleted file mode 100644
index a46393a31b4..00000000000
--- a/vendor/assets/stylesheets/basscss/_margin.scss
+++ /dev/null
@@ -1,96 +0,0 @@
-
-// Converted Variables
-
-$space-1: .5rem !default;
-$space-2: 1rem !default;
-$space-3: 2rem !default;
-$space-4: 4rem !default;
-
-// Custom Media Query Variables
-
-
-/* Basscss Margin */
-
-.m0  { margin:        0 }
-
-.mt0 { margin-top:    0 }
-
-.mr0 { margin-right:  0 }
-
-.mb0 { margin-bottom: 0 }
-
-.ml0 { margin-left:   0 }
-
-.mx0 { margin-left:   0; margin-right:  0 }
-
-.my0 { margin-top:    0; margin-bottom: 0 }
-
-.m1  { margin:        $space-1 }
-
-.mt1 { margin-top:    $space-1 }
-
-.mr1 { margin-right:  $space-1 }
-
-.mb1 { margin-bottom: $space-1 }
-
-.ml1 { margin-left:   $space-1 }
-
-.mx1 { margin-left:   $space-1; margin-right:  $space-1 }
-
-.my1 { margin-top:    $space-1; margin-bottom: $space-1 }
-
-.m2  { margin:        $space-2 }
-
-.mt2 { margin-top:    $space-2 }
-
-.mr2 { margin-right:  $space-2 }
-
-.mb2 { margin-bottom: $space-2 }
-
-.ml2 { margin-left:   $space-2 }
-
-.mx2 { margin-left:   $space-2; margin-right:  $space-2 }
-
-.my2 { margin-top:    $space-2; margin-bottom: $space-2 }
-
-.m3  { margin:        $space-3 }
-
-.mt3 { margin-top:    $space-3 }
-
-.mr3 { margin-right:  $space-3 }
-
-.mb3 { margin-bottom: $space-3 }
-
-.ml3 { margin-left:   $space-3 }
-
-.mx3 { margin-left:   $space-3; margin-right:  $space-3 }
-
-.my3 { margin-top:    $space-3; margin-bottom: $space-3 }
-
-.m4  { margin:        $space-4 }
-
-.mt4 { margin-top:    $space-4 }
-
-.mr4 { margin-right:  $space-4 }
-
-.mb4 { margin-bottom: $space-4 }
-
-.ml4 { margin-left:   $space-4 }
-
-.mx4 { margin-left:   $space-4; margin-right:  $space-4 }
-
-.my4 { margin-top:    $space-4; margin-bottom: $space-4 }
-
-.mxn1 { margin-left: -$space-1; margin-right: -$space-1; }
-
-.mxn2 { margin-left: -$space-2; margin-right: -$space-2; }
-
-.mxn3 { margin-left: -$space-3; margin-right: -$space-3; }
-
-.mxn4 { margin-left: -$space-4; margin-right: -$space-4; }
-
-.ml-auto { margin-left: auto }
-
-.mr-auto { margin-right: auto }
-
-.mx-auto { margin-left: auto; margin-right: auto; }
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/basscss/_padding.scss b/vendor/assets/stylesheets/basscss/_padding.scss
deleted file mode 100644
index 15945371b1f..00000000000
--- a/vendor/assets/stylesheets/basscss/_padding.scss
+++ /dev/null
@@ -1,82 +0,0 @@
-
-// Converted Variables
-
-$space-1: .5rem !default;
-$space-2: 1rem !default;
-$space-3: 2rem !default;
-$space-4: 4rem !default;
-
-// Custom Media Query Variables
-
-
-/* Basscss Padding */
-
-.p0  { padding: 0 }
-
-.pt0 { padding-top: 0 }
-
-.pr0 { padding-right: 0 }
-
-.pb0 { padding-bottom: 0 }
-
-.pl0 { padding-left: 0 }
-
-.px0 { padding-left: 0; padding-right:  0 }
-
-.py0 { padding-top: 0;  padding-bottom: 0 }
-
-.p1  { padding:        $space-1 }
-
-.pt1 { padding-top:    $space-1 }
-
-.pr1 { padding-right:  $space-1 }
-
-.pb1 { padding-bottom: $space-1 }
-
-.pl1 { padding-left:   $space-1 }
-
-.py1 { padding-top:    $space-1; padding-bottom: $space-1 }
-
-.px1 { padding-left:   $space-1; padding-right:  $space-1 }
-
-.p2  { padding:        $space-2 }
-
-.pt2 { padding-top:    $space-2 }
-
-.pr2 { padding-right:  $space-2 }
-
-.pb2 { padding-bottom: $space-2 }
-
-.pl2 { padding-left:   $space-2 }
-
-.py2 { padding-top:    $space-2; padding-bottom: $space-2 }
-
-.px2 { padding-left:   $space-2; padding-right:  $space-2 }
-
-.p3  { padding:        $space-3 }
-
-.pt3 { padding-top:    $space-3 }
-
-.pr3 { padding-right:  $space-3 }
-
-.pb3 { padding-bottom: $space-3 }
-
-.pl3 { padding-left:   $space-3 }
-
-.py3 { padding-top:    $space-3; padding-bottom: $space-3 }
-
-.px3 { padding-left:   $space-3; padding-right:  $space-3 }
-
-.p4  { padding:        $space-4 }
-
-.pt4 { padding-top:    $space-4 }
-
-.pr4 { padding-right:  $space-4 }
-
-.pb4 { padding-bottom: $space-4 }
-
-.pl4 { padding-left:   $space-4 }
-
-.py4 { padding-top:    $space-4; padding-bottom: $space-4 }
-
-.px4 { padding-left:   $space-4; padding-right:  $space-4 }
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/basscss/_responsive-margin.scss b/vendor/assets/stylesheets/basscss/_responsive-margin.scss
deleted file mode 100644
index 9e6f3eb5cf6..00000000000
--- a/vendor/assets/stylesheets/basscss/_responsive-margin.scss
+++ /dev/null
@@ -1,174 +0,0 @@
-
-// Converted Variables
-
-$space-1: .5rem !default;
-$space-2: 1rem !default;
-$space-3: 2rem !default;
-$space-4: 4rem !default;
-
-// Custom Media Query Variables
-
-$breakpoint-sm: '(min-width: 40em)' !default;
-$breakpoint-md: '(min-width: 52em)' !default;
-$breakpoint-lg: '(min-width: 64em)' !default;
-
-/* Basscss Responsive Margin */
-
-@media #{$breakpoint-sm} {
-
-  .sm-m0  { margin:        0 }
-  .sm-mt0 { margin-top:    0 }
-  .sm-mr0 { margin-right:  0 }
-  .sm-mb0 { margin-bottom: 0 }
-  .sm-ml0 { margin-left:   0 }
-  .sm-mx0 { margin-left:   0; margin-right:  0 }
-  .sm-my0 { margin-top:    0; margin-bottom: 0 }
-
-  .sm-m1  { margin:        $space-1 }
-  .sm-mt1 { margin-top:    $space-1 }
-  .sm-mr1 { margin-right:  $space-1 }
-  .sm-mb1 { margin-bottom: $space-1 }
-  .sm-ml1 { margin-left:   $space-1 }
-  .sm-mx1 { margin-left:   $space-1; margin-right:  $space-1 }
-  .sm-my1 { margin-top:    $space-1; margin-bottom: $space-1 }
-
-  .sm-m2  { margin:        $space-2 }
-  .sm-mt2 { margin-top:    $space-2 }
-  .sm-mr2 { margin-right:  $space-2 }
-  .sm-mb2 { margin-bottom: $space-2 }
-  .sm-ml2 { margin-left:   $space-2 }
-  .sm-mx2 { margin-left:   $space-2; margin-right:  $space-2 }
-  .sm-my2 { margin-top:    $space-2; margin-bottom: $space-2 }
-
-  .sm-m3  { margin:        $space-3 }
-  .sm-mt3 { margin-top:    $space-3 }
-  .sm-mr3 { margin-right:  $space-3 }
-  .sm-mb3 { margin-bottom: $space-3 }
-  .sm-ml3 { margin-left:   $space-3 }
-  .sm-mx3 { margin-left:   $space-3; margin-right:  $space-3 }
-  .sm-my3 { margin-top:    $space-3; margin-bottom: $space-3 }
-
-  .sm-m4  { margin:        $space-4 }
-  .sm-mt4 { margin-top:    $space-4 }
-  .sm-mr4 { margin-right:  $space-4 }
-  .sm-mb4 { margin-bottom: $space-4 }
-  .sm-ml4 { margin-left:   $space-4 }
-  .sm-mx4 { margin-left:   $space-4; margin-right:  $space-4 }
-  .sm-my4 { margin-top:    $space-4; margin-bottom: $space-4 }
-
-  .sm-mxn1 { margin-left: -$space-1; margin-right: -$space-1 }
-  .sm-mxn2 { margin-left: -$space-2; margin-right: -$space-2 }
-  .sm-mxn3 { margin-left: -$space-3; margin-right: -$space-3 }
-  .sm-mxn4 { margin-left: -$space-4; margin-right: -$space-4 }
-
-  .sm-ml-auto { margin-left:  auto }
-  .sm-mr-auto { margin-right: auto }
-  .sm-mx-auto { margin-left:  auto; margin-right: auto }
-
-}
-
-@media #{$breakpoint-md} {
-
-  .md-m0  { margin:        0 }
-  .md-mt0 { margin-top:    0 }
-  .md-mr0 { margin-right:  0 }
-  .md-mb0 { margin-bottom: 0 }
-  .md-ml0 { margin-left:   0 }
-  .md-mx0 { margin-left:   0; margin-right:  0 }
-  .md-my0 { margin-top:    0; margin-bottom: 0 }
-
-  .md-m1  { margin:        $space-1 }
-  .md-mt1 { margin-top:    $space-1 }
-  .md-mr1 { margin-right:  $space-1 }
-  .md-mb1 { margin-bottom: $space-1 }
-  .md-ml1 { margin-left:   $space-1 }
-  .md-mx1 { margin-left:   $space-1; margin-right:  $space-1 }
-  .md-my1 { margin-top:    $space-1; margin-bottom: $space-1 }
-
-  .md-m2  { margin:        $space-2 }
-  .md-mt2 { margin-top:    $space-2 }
-  .md-mr2 { margin-right:  $space-2 }
-  .md-mb2 { margin-bottom: $space-2 }
-  .md-ml2 { margin-left:   $space-2 }
-  .md-mx2 { margin-left:   $space-2; margin-right:  $space-2 }
-  .md-my2 { margin-top:    $space-2; margin-bottom: $space-2 }
-
-  .md-m3  { margin:        $space-3 }
-  .md-mt3 { margin-top:    $space-3 }
-  .md-mr3 { margin-right:  $space-3 }
-  .md-mb3 { margin-bottom: $space-3 }
-  .md-ml3 { margin-left:   $space-3 }
-  .md-mx3 { margin-left:   $space-3; margin-right:  $space-3 }
-  .md-my3 { margin-top:    $space-3; margin-bottom: $space-3 }
-
-  .md-m4  { margin:        $space-4 }
-  .md-mt4 { margin-top:    $space-4 }
-  .md-mr4 { margin-right:  $space-4 }
-  .md-mb4 { margin-bottom: $space-4 }
-  .md-ml4 { margin-left:   $space-4 }
-  .md-mx4 { margin-left:   $space-4; margin-right:  $space-4 }
-  .md-my4 { margin-top:    $space-4; margin-bottom: $space-4 }
-
-  .md-mxn1 { margin-left: -$space-1; margin-right: -$space-1; }
-  .md-mxn2 { margin-left: -$space-2; margin-right: -$space-2; }
-  .md-mxn3 { margin-left: -$space-3; margin-right: -$space-3; }
-  .md-mxn4 { margin-left: -$space-4; margin-right: -$space-4; }
-
-  .md-ml-auto { margin-left:  auto }
-  .md-mr-auto { margin-right: auto }
-  .md-mx-auto { margin-left: auto; margin-right: auto; }
-
-}
-
-@media #{$breakpoint-lg} {
-
-  .lg-m0  { margin:        0 }
-  .lg-mt0 { margin-top:    0 }
-  .lg-mr0 { margin-right:  0 }
-  .lg-mb0 { margin-bottom: 0 }
-  .lg-ml0 { margin-left:   0 }
-  .lg-mx0 { margin-left:   0; margin-right:  0 }
-  .lg-my0 { margin-top:    0; margin-bottom: 0 }
-
-  .lg-m1  { margin:        $space-1 }
-  .lg-mt1 { margin-top:    $space-1 }
-  .lg-mr1 { margin-right:  $space-1 }
-  .lg-mb1 { margin-bottom: $space-1 }
-  .lg-ml1 { margin-left:   $space-1 }
-  .lg-mx1 { margin-left:   $space-1; margin-right:  $space-1 }
-  .lg-my1 { margin-top:    $space-1; margin-bottom: $space-1 }
-
-  .lg-m2  { margin:        $space-2 }
-  .lg-mt2 { margin-top:    $space-2 }
-  .lg-mr2 { margin-right:  $space-2 }
-  .lg-mb2 { margin-bottom: $space-2 }
-  .lg-ml2 { margin-left:   $space-2 }
-  .lg-mx2 { margin-left:   $space-2; margin-right:  $space-2 }
-  .lg-my2 { margin-top:    $space-2; margin-bottom: $space-2 }
-
-  .lg-m3  { margin:        $space-3 }
-  .lg-mt3 { margin-top:    $space-3 }
-  .lg-mr3 { margin-right:  $space-3 }
-  .lg-mb3 { margin-bottom: $space-3 }
-  .lg-ml3 { margin-left:   $space-3 }
-  .lg-mx3 { margin-left:   $space-3; margin-right:  $space-3 }
-  .lg-my3 { margin-top:    $space-3; margin-bottom: $space-3 }
-
-  .lg-m4  { margin:        $space-4 }
-  .lg-mt4 { margin-top:    $space-4 }
-  .lg-mr4 { margin-right:  $space-4 }
-  .lg-mb4 { margin-bottom: $space-4 }
-  .lg-ml4 { margin-left:   $space-4 }
-  .lg-mx4 { margin-left:   $space-4; margin-right:  $space-4 }
-  .lg-my4 { margin-top:    $space-4; margin-bottom: $space-4 }
-
-  .lg-mxn1 { margin-left: -$space-1; margin-right: -$space-1; }
-  .lg-mxn2 { margin-left: -$space-2; margin-right: -$space-2; }
-  .lg-mxn3 { margin-left: -$space-3; margin-right: -$space-3; }
-  .lg-mxn4 { margin-left: -$space-4; margin-right: -$space-4; }
-
-  .lg-ml-auto { margin-left:  auto }
-  .lg-mr-auto { margin-right: auto }
-  .lg-mx-auto { margin-left: auto; margin-right: auto; }
-
-}
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/basscss/_responsive-padding.scss b/vendor/assets/stylesheets/basscss/_responsive-padding.scss
deleted file mode 100644
index 7843b1e6784..00000000000
--- a/vendor/assets/stylesheets/basscss/_responsive-padding.scss
+++ /dev/null
@@ -1,147 +0,0 @@
-
-// Converted Variables
-
-$space-1: .5rem !default;
-$space-2: 1rem !default;
-$space-3: 2rem !default;
-$space-4: 4rem !default;
-
-// Custom Media Query Variables
-
-$breakpoint-sm: '(min-width: 40em)' !default;
-$breakpoint-md: '(min-width: 52em)' !default;
-$breakpoint-lg: '(min-width: 64em)' !default;
-
-/* Basscss Responsive Padding */
-
-@media #{$breakpoint-sm} {
-
-  .sm-p0  { padding:        0 }
-  .sm-pt0 { padding-top:    0 }
-  .sm-pr0 { padding-right:  0 }
-  .sm-pb0 { padding-bottom: 0 }
-  .sm-pl0 { padding-left:   0 }
-  .sm-px0 { padding-left:   0; padding-right:  0 }
-  .sm-py0 { padding-top:    0; padding-bottom: 0 }
-
-  .sm-p1  { padding:        $space-1 }
-  .sm-pt1 { padding-top:    $space-1 }
-  .sm-pr1 { padding-right:  $space-1 }
-  .sm-pb1 { padding-bottom: $space-1 }
-  .sm-pl1 { padding-left:   $space-1 }
-  .sm-px1 { padding-left:   $space-1; padding-right:  $space-1 }
-  .sm-py1 { padding-top:    $space-1; padding-bottom: $space-1 }
-
-  .sm-p2  { padding:        $space-2 }
-  .sm-pt2 { padding-top:    $space-2 }
-  .sm-pr2 { padding-right:  $space-2 }
-  .sm-pb2 { padding-bottom: $space-2 }
-  .sm-pl2 { padding-left:   $space-2 }
-  .sm-px2 { padding-left:   $space-2; padding-right:  $space-2 }
-  .sm-py2 { padding-top:    $space-2; padding-bottom: $space-2 }
-
-  .sm-p3  { padding:        $space-3 }
-  .sm-pt3 { padding-top:    $space-3 }
-  .sm-pr3 { padding-right:  $space-3 }
-  .sm-pb3 { padding-bottom: $space-3 }
-  .sm-pl3 { padding-left:   $space-3 }
-  .sm-px3 { padding-left:   $space-3; padding-right:  $space-3 }
-  .sm-py3 { padding-top:    $space-3; padding-bottom: $space-3 }
-
-  .sm-p4  { padding:        $space-4 }
-  .sm-pt4 { padding-top:    $space-4 }
-  .sm-pr4 { padding-right:  $space-4 }
-  .sm-pb4 { padding-bottom: $space-4 }
-  .sm-pl4 { padding-left:   $space-4 }
-  .sm-px4 { padding-left:   $space-4; padding-right:  $space-4 }
-  .sm-py4 { padding-top:    $space-4; padding-bottom: $space-4 }
-
-}
-
-@media #{$breakpoint-md} {
-
-  .md-p0  { padding:        0 }
-  .md-pt0 { padding-top:    0 }
-  .md-pr0 { padding-right:  0 }
-  .md-pb0 { padding-bottom: 0 }
-  .md-pl0 { padding-left:   0 }
-  .md-px0 { padding-left:   0; padding-right:  0 }
-  .md-py0 { padding-top:    0; padding-bottom: 0 }
-
-  .md-p1  { padding:        $space-1 }
-  .md-pt1 { padding-top:    $space-1 }
-  .md-pr1 { padding-right:  $space-1 }
-  .md-pb1 { padding-bottom: $space-1 }
-  .md-pl1 { padding-left:   $space-1 }
-  .md-px1 { padding-left:   $space-1; padding-right:  $space-1 }
-  .md-py1 { padding-top:    $space-1; padding-bottom: $space-1 }
-
-  .md-p2  { padding:        $space-2 }
-  .md-pt2 { padding-top:    $space-2 }
-  .md-pr2 { padding-right:  $space-2 }
-  .md-pb2 { padding-bottom: $space-2 }
-  .md-pl2 { padding-left:   $space-2 }
-  .md-px2 { padding-left:   $space-2; padding-right:  $space-2 }
-  .md-py2 { padding-top:    $space-2; padding-bottom: $space-2 }
-
-  .md-p3  { padding:        $space-3 }
-  .md-pt3 { padding-top:    $space-3 }
-  .md-pr3 { padding-right:  $space-3 }
-  .md-pb3 { padding-bottom: $space-3 }
-  .md-pl3 { padding-left:   $space-3 }
-  .md-px3 { padding-left:   $space-3; padding-right:  $space-3 }
-  .md-py3 { padding-top:    $space-3; padding-bottom: $space-3 }
-
-  .md-p4  { padding:        $space-4 }
-  .md-pt4 { padding-top:    $space-4 }
-  .md-pr4 { padding-right:  $space-4 }
-  .md-pb4 { padding-bottom: $space-4 }
-  .md-pl4 { padding-left:   $space-4 }
-  .md-px4 { padding-left:   $space-4; padding-right:  $space-4 }
-  .md-py4 { padding-top:    $space-4; padding-bottom: $space-4 }
-
-}
-
-@media #{$breakpoint-lg} {
-
-  .lg-p0  { padding:        0 }
-  .lg-pt0 { padding-top:    0 }
-  .lg-pr0 { padding-right:  0 }
-  .lg-pb0 { padding-bottom: 0 }
-  .lg-pl0 { padding-left:   0 }
-  .lg-px0 { padding-left:   0; padding-right:  0 }
-  .lg-py0 { padding-top:    0; padding-bottom: 0 }
-
-  .lg-p1  { padding:        $space-1 }
-  .lg-pt1 { padding-top:    $space-1 }
-  .lg-pr1 { padding-right:  $space-1 }
-  .lg-pb1 { padding-bottom: $space-1 }
-  .lg-pl1 { padding-left:   $space-1 }
-  .lg-px1 { padding-left:   $space-1; padding-right:  $space-1 }
-  .lg-py1 { padding-top:    $space-1; padding-bottom: $space-1 }
-
-  .lg-p2  { padding:        $space-2 }
-  .lg-pt2 { padding-top:    $space-2 }
-  .lg-pr2 { padding-right:  $space-2 }
-  .lg-pb2 { padding-bottom: $space-2 }
-  .lg-pl2 { padding-left:   $space-2 }
-  .lg-px2 { padding-left:   $space-2; padding-right:  $space-2 }
-  .lg-py2 { padding-top:    $space-2; padding-bottom: $space-2 }
-
-  .lg-p3  { padding:        $space-3 }
-  .lg-pt3 { padding-top:    $space-3 }
-  .lg-pr3 { padding-right:  $space-3 }
-  .lg-pb3 { padding-bottom: $space-3 }
-  .lg-pl3 { padding-left:   $space-3 }
-  .lg-px3 { padding-left:   $space-3; padding-right:  $space-3 }
-  .lg-py3 { padding-top:    $space-3; padding-bottom: $space-3 }
-
-  .lg-p4  { padding:        $space-4 }
-  .lg-pt4 { padding-top:    $space-4 }
-  .lg-pr4 { padding-right:  $space-4 }
-  .lg-pb4 { padding-bottom: $space-4 }
-  .lg-pl4 { padding-left:   $space-4 }
-  .lg-px4 { padding-left:   $space-4; padding-right:  $space-4 }
-  .lg-py4 { padding-top:    $space-4; padding-bottom: $space-4 }
-
-}
\ No newline at end of file