diff --git a/.gitignore b/.gitignore
index 45e8ddf0..8d1fd7e9 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 _site
-.sass-cache
+.*-cache
 .jekyll-metadata
 .DS_Store
+.netlify
diff --git a/Gemfile b/Gemfile
index 90e981ea..5dfe62f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,15 +1,3 @@
 source 'https://rubygems.org'
 
-require 'json'
-require 'open-uri'
-versions = JSON.parse(open('https://pages.github.com/versions.json').read)
-
-gem 'github-pages', versions['github-pages']
-gem 'jekyll-github-metadata'
-gem 'jekyll-relative-links'
-gem 'jekyll-seo-tag'
-gem 'jekyll-sitemap'
-gem 'jekyll-redirect-from'
-gem 'jekyll-include-cache'
-gem 'jekyll-remote-theme'
-gem 'wai-website-plugin'
+gem "wai-gems", :path => "_external/data/wai-gems"
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 00000000..e0cd77a6
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,114 @@
+PATH
+  remote: _external/data/wai-gems
+  specs:
+    wai-gems (1.0.0)
+      jekyll-github-metadata
+      jekyll-include-cache
+      jekyll-paginate
+      jekyll-redirect-from
+      jekyll-relative-links
+      jekyll-remote-theme
+      jekyll-seo-tag
+      jekyll-sitemap
+      wai-website-plugin
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    colorator (1.1.0)
+    concurrent-ruby (1.1.7)
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.7)
+    faraday (1.1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords
+    ffi (1.13.1)
+    forwardable-extended (2.6.0)
+    http_parser.rb (0.6.0)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    jekyll (4.2.0)
+      addressable (~> 2.4)
+      colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 1.0)
+      jekyll-sass-converter (~> 2.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.0)
+      liquid (~> 4.0)
+      mercenary (~> 0.4.0)
+      pathutil (~> 0.9)
+      rouge (~> 3.0)
+      safe_yaml (~> 1.0)
+      terminal-table (~> 2.0)
+    jekyll-github-metadata (2.13.0)
+      jekyll (>= 3.4, < 5.0)
+      octokit (~> 4.0, != 4.4.0)
+    jekyll-include-cache (0.2.1)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-relative-links (0.6.1)
+      jekyll (>= 3.3, < 5.0)
+    jekyll-remote-theme (0.4.2)
+      addressable (~> 2.0)
+      jekyll (>= 3.5, < 5.0)
+      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
+      rubyzip (>= 1.3.0, < 3.0)
+    jekyll-sass-converter (2.1.0)
+      sassc (> 2.0.1, < 3.0)
+    jekyll-seo-tag (2.7.1)
+      jekyll (>= 3.8, < 5.0)
+    jekyll-sitemap (1.4.0)
+      jekyll (>= 3.7, < 5.0)
+    jekyll-watch (2.2.1)
+      listen (~> 3.0)
+    kramdown (2.3.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    liquid (4.0.3)
+    listen (3.3.3)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    mercenary (0.4.0)
+    multipart-post (2.1.1)
+    octokit (4.19.0)
+      faraday (>= 0.9)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    pathutil (0.16.2)
+      forwardable-extended (~> 2.6)
+    public_suffix (4.0.6)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rexml (3.2.4)
+    rouge (3.26.0)
+    ruby2_keywords (0.0.2)
+    rubyzip (2.3.0)
+    safe_yaml (1.0.5)
+    sassc (2.4.0)
+      ffi (~> 1.9)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
+    terminal-table (2.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
+    unicode-display_width (1.7.0)
+    wai-website-plugin (0.2)
+      jekyll (>= 3.6, < 5.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  wai-gems!
+
+BUNDLED WITH
+   2.2.2
diff --git a/README.md b/README.md
index 940f497a..9a2e6d10 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,4 @@
-# How People With Disabilities use the Web
-
-Preview: https://wai-people-use-web.netlify.com/
+[![Netlify Status](https://api.netlify.com/api/v1/badges/bc1f0553-a688-4748-94f1-0d8d80c856f2/deploy-status)](https://app.netlify.com/sites/wai-people-use-web/deploys)
 
 ## Translation Notes
 
diff --git a/_external/data b/_external/data
index b680530d..16c14b3b 160000
--- a/_external/data
+++ b/_external/data
@@ -1 +1 @@
-Subproject commit b680530df76a691b759c89680703debf4e7990b5
+Subproject commit 16c14b3b0dc9d9db6b3a4e45753ed81d451dc24f
diff --git a/netlify.toml b/netlify.toml
index 9fc3c47b..54bbb045 100644
--- a/netlify.toml
+++ b/netlify.toml
@@ -1,10 +1,6 @@
-[Settings]
-
-ID = "wai-people-use-web"
-
 [build]
-
-command = "bundle exec jekyll build --config '_config.yml,_config_staging.yml'"
+command = "git submodule update --init --remote && bundle exec jekyll build --config '_config.yml,_config_staging.yml'"
+publish = "_site"
 
 [build.environment]
 RUBY_VERSION = "2.6.2" 
@@ -12,3 +8,7 @@ RUBY_VERSION = "2.6.2"
 [[redirects]]
   from = "/"
   to = "/people-use-web/"
+
+[dev]
+publish = "_site"
+framework = "#static"