diff --git a/.circleci/config.yml b/.circleci/config.yml
index 244a44ca2..4a7f1666d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2
 jobs:
   build:
     docker:
-       - image: circleci/ruby:2.7.4-node-browsers
+       - image: cimg/ruby:3.1.1-browsers
          environment:
             RAILS_ENV: test
             PGHOST: 127.0.0.1
@@ -41,6 +41,13 @@ jobs:
       - run: bundle exec rake db:create
       - run: bundle exec rake db:schema:load
 
+      # Install chrome driver
+      - run:
+          name: Setup Chrome
+          command: |
+            wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+            sudo apt install ./google-chrome-stable_current_amd64.deb
+
       # run tests!
       - run:
           name: run tests
diff --git a/.env.test b/.env.test
index e5233cb0b..62f89850c 100644
--- a/.env.test
+++ b/.env.test
@@ -28,3 +28,6 @@ TOUCHPOINTS_EMAIL_SENDER=from@example.gov
 TOUCHPOINTS_SUPPORT=support@example.gov
 TOUCHPOINTS_TEAM=team@example.gov
 TOUCHPOINTS_WEB_DOMAIN=127.0.0.1
+
+DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
+
diff --git a/Dockerfile b/Dockerfile
index ec8db40ee..3faf819d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,34 +1,20 @@
-# gets the docker image of ruby 2.5 and lets us build on top of that
-FROM ruby:2.6.5-slim
+FROM ruby:3.1.1-slim
 
-# install rails dependencies
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs postgresql-client && apt-get install -y git
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential \
+    libpq-dev \
+    postgresql-client \
+    nodejs \
+    git \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# create a folder /FlexUOMConverter in the docker container and go into that folder
-RUN mkdir /touchpoints
-WORKDIR /touchpoints
+RUN gem update --system
+RUN gem install bundler:2.3.8
 
-# Copy the Gemfile and Gemfile.lock from app root directory into the /myapp/ folder in the docker container
-COPY Gemfile /touchpoints/Gemfile
+WORKDIR /usr/src/app
 
-# Run bundle install to install gems inside the gemfile
-RUN bundle install
+ENTRYPOINT ["./entrypoint.sh"]
 
+EXPOSE 3002
 
-# Copy the whole app
-COPY . /touchpoints
-
-RUN cd /touchpoints
-
-# Expose port 3000 to the Docker host, so we can access it
-# from the outside.
-EXPOSE 3000
-
-# Configure an entry point, so we don't need to specify
-# "bundle exec" for each of our commands.
-ENTRYPOINT ["bundle", "exec"]
-
-# The main command to run when the container starts. Also
-# tell the Rails dev server to bind to all interfaces by
-# default.
-CMD ["rails", "server", "-b", "0.0.0.0"]
+CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"]
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 3cbae613b..ed11f51ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,56 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.4'
+ruby '3.1.1'
+
+# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
+gem "rails", "~> 7.0.2", ">= 7.0.2.2"
+
+# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
+gem "sprockets-rails"
+
+# Use postgresql as the database for Active Record
+gem "pg", "~> 1.3"
+
+# Use the Puma web server [https://github.com/puma/puma]
+gem "puma", "~> 5.6"
+
+# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
+gem "importmap-rails"
+
+# Hotwire"s SPA-like page accelerator [https://turbo.hotwired.dev]
+gem "turbo-rails"
+
+# Hotwire"s modest JavaScript framework [https://stimulus.hotwired.dev]
+gem "stimulus-rails"
+
+# Build JSON APIs with ease [https://github.com/rails/jbuilder]
+gem "jbuilder"
+
+# Use Redis adapter to run Action Cable in production
+gem "redis", "~> 4.6"
+
+# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
+# gem "kredis"
+
+# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
+# gem "bcrypt", "~> 3.1.7"
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw jruby]
+
+# Reduces boot times through caching; required in config/boot.rb
+gem "bootsnap", require: false
+
+# Use Sass to process CSS
+# gem "sassc-rails", "~> 2.1"
+
+# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
+gem "image_processing", "~> 1.12"
+
+gem "brakeman"
+gem "bundler-audit"
+gem "rubocop-rails"
 
 gem 'active_model_serializers', '>= 0.10.13'
 gem 'acts-as-list'
@@ -19,16 +68,12 @@ gem 'mini_magick'
 gem 'newrelic_rpm'
 gem 'omniauth-github'
 gem 'omniauth_login_dot_gov', git: 'https://github.com/18F/omniauth_login_dot_gov.git', branch: 'main'
-gem 'rails', '>= 6.1.4.4'
-gem 'pg', '~> 1.3.1'
-gem 'puma', '~> 5.6.2'
 gem 'rack-cors', '>= 1.1.1', require: 'rack/cors'
 gem 'sass-rails', '>= 6.0.0'
 gem 'sidekiq'
 gem 'uglifier'
 gem 'json-jwt'
 # Use Redis to cache Touchpoints in all envs
-gem 'redis'
 gem 'redis-namespace'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
@@ -37,7 +82,7 @@ gem 'aasm', '~> 5.2.0'
 gem 'whenever', require: false
 gem 'logstop'
 gem 'paper_trail'
-gem 'acts-as-taggable-on', '~> 8.0'
+gem 'acts-as-taggable-on'
 gem "rolify"
 
 group :development, :test do
@@ -66,5 +111,3 @@ group :test do
   gem 'webdrivers', '>= 5.0.0'
 end
 
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
diff --git a/Gemfile.lock b/Gemfile.lock
index d224106c6..2f4785716 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,40 +18,47 @@ GEM
     aasm-diagram (0.1.3)
       aasm (~> 5.0, >= 4.12)
       ruby-graphviz (~> 1.2)
-    actioncable (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actioncable (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionmailbox (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      actionview (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.4)
-      actionview (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.3)
+      actionview (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actiontext (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    actionview (7.0.2.3)
+      activesupport (= 7.0.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -61,38 +68,38 @@ GEM
       activemodel (>= 4.1, < 7.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.4.4)
-      activesupport (= 6.1.4.4)
+    activejob (7.0.2.3)
+      activesupport (= 7.0.2.3)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activestorage (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-      marcel (~> 1.0.0)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activestorage (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.4)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     acts-as-list (0.1.2)
-    acts-as-taggable-on (8.1.0)
-      activerecord (>= 5.0, < 6.2)
+    acts-as-taggable-on (9.0.1)
+      activerecord (>= 6.0, < 7.1)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
+    ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.564.0)
+    aws-partitions (1.568.0)
     aws-record (2.7.0)
       aws-sdk-dynamodb (~> 1.18)
-    aws-sdk-core (3.129.0)
+    aws-sdk-core (3.130.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
@@ -118,10 +125,16 @@ GEM
       rack (~> 2)
     aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.17)
     bindata (2.4.10)
     bindex (0.8.1)
+    bootsnap (1.11.1)
+      msgpack (~> 1.2)
+    brakeman (5.2.1)
     builder (3.2.4)
+    bundler-audit (0.9.0.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     capybara (3.36.0)
       addressable
       matrix
@@ -164,13 +177,14 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.0)
+    digest (3.1.0)
     docile (1.4.0)
     dotenv (2.7.6)
     dotenv-rails (2.7.6)
       dotenv (= 2.7.6)
       railties (>= 3.2)
     erubi (1.10.0)
-    excon (0.91.0)
+    excon (0.92.0)
     execjs (2.8.1)
     factory_bot (6.2.0)
       activesupport (>= 5.0.0)
@@ -204,6 +218,13 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    importmap-rails (1.0.3)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
+    io-wait (0.2.1)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
+      activesupport (>= 5.0.0)
     jmespath (1.6.1)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
@@ -231,12 +252,11 @@ GEM
     kaminari-core (1.2.2)
     kramdown (2.3.1)
       rexml
-    listen (3.1.5)
+    listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
     logstop (0.2.8)
-    loofah (2.14.0)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -249,16 +269,28 @@ GEM
     mime-types-data (3.2022.0105)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
     minitest (5.15.0)
+    msgpack (1.4.5)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     newrelic_rpm (8.5.0)
     nio4r (2.5.8)
-    nokogiri (1.13.3)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
     nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     oauth2 (1.4.9)
@@ -278,10 +310,13 @@ GEM
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     orm_adapter (0.5.0)
-    paper_trail (12.2.0)
+    paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    pg (1.3.3)
+    parallel (1.21.0)
+    parser (3.1.1.0)
+      ast (~> 2.4.1)
+    pg (1.3.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -296,21 +331,20 @@ GEM
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.4)
-      actioncable (= 6.1.4.4)
-      actionmailbox (= 6.1.4.4)
-      actionmailer (= 6.1.4.4)
-      actionpack (= 6.1.4.4)
-      actiontext (= 6.1.4.4)
-      actionview (= 6.1.4.4)
-      activejob (= 6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activerecord (= 6.1.4.4)
-      activestorage (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    rails (7.0.2.3)
+      actioncable (= 7.0.2.3)
+      actionmailbox (= 7.0.2.3)
+      actionmailer (= 7.0.2.3)
+      actionpack (= 7.0.2.3)
+      actiontext (= 7.0.2.3)
+      actionview (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.4)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.2.3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -320,18 +354,20 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.4)
-      actionpack (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
+    railties (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.6.0)
-    redis-namespace (1.8.1)
+    redis-namespace (1.8.2)
       redis (>= 3.0.4)
     regexp_parser (2.2.1)
     request_store (1.5.1)
@@ -360,11 +396,26 @@ GEM
     rspec-support (3.11.0)
     rspec_junit_formatter (0.5.1)
       rspec-core (>= 2, < 4, != 2.12.0)
+    rubocop (1.26.0)
+      parallel (~> 1.10)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.16.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rails (2.14.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
     ruby-graphviz (1.2.5)
       rexml
+    ruby-progressbar (1.11.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
-    ruby_dep (1.5.0)
     rubyzip (1.3.0)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -398,12 +449,20 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.7)
+    stimulus-rails (1.0.4)
+      railties (>= 6.0.0)
+    strscan (3.0.1)
     thor (1.2.1)
     tilt (2.0.10)
+    timeout (0.2.0)
+    turbo-rails (1.0.1)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
+    unicode-display_width (2.1.0)
     warden (1.2.9)
       rack (>= 2.0.9)
     web-console (4.2.0)
@@ -425,17 +484,18 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
-  ruby
   x86_64-darwin-19
-  x86_64-darwin-20
 
 DEPENDENCIES
   aasm (~> 5.2.0)
   aasm-diagram
   active_model_serializers (>= 0.10.13)
   acts-as-list
-  acts-as-taggable-on (~> 8.0)
+  acts-as-taggable-on
   aws-sdk-rails (>= 3.6.1)
+  bootsnap
+  brakeman
+  bundler-audit
   capybara (>= 3.35.3)
   caracal (>= 1.4.1)
   carrierwave (>= 2.2.1)
@@ -444,6 +504,9 @@ DEPENDENCIES
   dotenv-rails (>= 2.7.6)
   factory_bot_rails (>= 6.2.0)
   fog-aws (>= 3.12.0)
+  image_processing (~> 1.12)
+  importmap-rails
+  jbuilder
   jquery-rails (>= 4.4.0)
   jquery-ui-rails (>= 6.0.1)
   json-jwt
@@ -457,21 +520,25 @@ DEPENDENCIES
   omniauth-github
   omniauth_login_dot_gov!
   paper_trail
-  pg (~> 1.3.1)
+  pg (~> 1.3)
   pry
-  puma (~> 5.6.2)
+  puma (~> 5.6)
   rack-cors (>= 1.1.1)
-  rails (>= 6.1.4.4)
+  rails (~> 7.0.2, >= 7.0.2.2)
   rails-controller-testing (>= 1.0.5)
-  redis
+  redis (~> 4.6)
   redis-namespace
   rolify
   rspec-rails (>= 5.0.2)
   rspec_junit_formatter
+  rubocop-rails
   sass-rails (>= 6.0.0)
   selenium-webdriver
   sidekiq
   simplecov
+  sprockets-rails
+  stimulus-rails
+  turbo-rails
   tzinfo-data
   uglifier
   web-console (>= 4.1.0)
@@ -479,7 +546,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.7.4p191
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   2.2.24
+   2.3.7
diff --git a/README.md b/README.md
index 893c36d5e..5e41266cc 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,29 @@ The Touchpoints team tracks work in a [backlog](https://en.wikipedia.org/wiki/Ka
 
 Issues and ideas are also noted in GitHub [Issues](https://github.com/gsa/touchpoints/issues).
 
+## Docker development
+
+Setup
+
+1. install Docker
+2. clone repo
+3. copy .env.sample .env and update vars
+
+To build a development environment
+
+1. docker-compose build
+2. docker-compose run webapp rails db:create
+3. docker-compose run webapp rails db:setup
+4. docker-compose up
+5. Navigate to http://lvh.me:3002/admin
+
+To start/stop after building
+1. docker-compose up
+2. docker-compose down
+
+To run tests (TBD -- this currently does not work with selenium web driver)
+1. docker-compose run webapp rspec
+
 ## License
 
 See [LICENSE](LICENSE.md)
diff --git a/app/models/submission.rb b/app/models/submission.rb
index 566f4fc05..d94d9c956 100644
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -57,7 +57,7 @@ def validate_custom_form
     # Run Custom Validations
     questions.each do |question|
       if question.is_required && !answered_questions[question.answer_field]
-        errors.messages[question.answer_field] << "is required"
+        errors.add(question.answer_field.to_sym, :blank, message: "is required")
       end
 
       if question.character_limit.present? && answered_questions[question.answer_field] && answered_questions[question.answer_field].length > question.character_limit
diff --git a/bin/rails b/bin/rails
index 6fb4e4051..efc037749 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
+APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"
diff --git a/bin/setup b/bin/setup
index 583be4a57..ec47b79b3 100755
--- a/bin/setup
+++ b/bin/setup
@@ -2,7 +2,7 @@
 require "fileutils"
 
 # path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
+APP_ROOT = File.expand_path("..", __dir__)
 
 def system!(*args)
   system(*args) || abort("\n== Command #{args} failed ==")
@@ -13,24 +13,21 @@ FileUtils.chdir APP_ROOT do
   # This script is idempotent, so that you can run it at any time and get an expectable outcome.
   # Add necessary setup steps to this file.
 
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies
-  # system! 'bin/yarn'
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
   # puts "\n== Copying sample files =="
-  # unless File.exist?('config/database.yml')
-  #   FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
   # end
 
   puts "\n== Preparing database =="
-  system! 'bin/rails db:prepare'
+  system! "bin/rails db:prepare"
 
   puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
+  system! "bin/rails log:clear tmp:clear"
 
   puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
+  system! "bin/rails restart"
 end
diff --git a/config/database.yml b/config/database.yml
index 7d938cdcc..9fa30a00a 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -23,9 +23,6 @@ default: &default
 
 development:
   <<: *default
-  # Uncomment host and username if running docker containers ( docker-compose )
-  #host: postgres
-  #username: postgres
   database: touchpoints_development
 
   # The specified database role being used to connect to postgres.
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
new file mode 100644
index 000000000..a579326e2
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_0.rb
@@ -0,0 +1,117 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.0 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.0`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# `button_to` view helper will render `<button>` element, regardless of whether
+# or not the content is passed as the first argument or as a block.
+# Rails.application.config.action_view.button_to_generates_button_tag = true
+
+# `stylesheet_link_tag` view helper will not render the media attribute by default.
+# Rails.application.config.action_view.apply_stylesheet_media_default = false
+
+# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
+# Changing this default means invalidate all encrypted messages generated by
+# your application and, all the encrypted cookies. Only change this after you
+# rotated all the messages using the key rotator.
+#
+# See upgrading guide for more information on how to build a rotator.
+# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
+# Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
+
+# Change the digest class for ActiveSupport::Digest.
+# Changing this default means that for example Etags change and
+# various cache keys leading to cache invalidation.
+# Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
+
+# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
+# implementation.
+# Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
+
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 6.1 applications.
+# Only change this value after your application is fully deployed to Rails 7.0
+# and you have no plans to rollback.
+# Rails.application.config.active_support.cache_format_version = 7.0
+
+# Calls `Rails.application.executor.wrap` around test cases.
+# This makes test cases behave closer to an actual request or job.
+# Several features that are normally disabled in test, such as Active Record query cache
+# and asynchronous queries will then be enabled.
+# Rails.application.config.active_support.executor_around_test_case = true
+
+# Define the isolation level of most of Rails internal state.
+# If you use a fiber based server or job processor, you should set it to `:fiber`.
+# Otherwise the default of `:thread` if preferable.
+# Rails.application.config.active_support.isolation_level = :thread
+
+# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
+# Rails.application.config.action_mailer.smtp_timeout = 5
+
+# The ActiveStorage video previewer will now use scene change detection to generate
+# better preview images (rather than the previous default of using the first frame
+# of the video).
+# Rails.application.config.active_storage.video_preview_arguments =
+#   "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
+
+# Automatically infer `inverse_of` for associations with a scope.
+# Rails.application.config.active_record.automatic_scope_inversing = true
+
+# Raise when running tests if fixtures contained foreign key violations
+# Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
+
+# Disable partial inserts.
+# This default means that all columns will be referenced in INSERT queries
+# regardless of whether they have a default or not.
+# Rails.application.config.active_record.partial_inserts = false
+#
+# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
+# Rails.application.config.action_controller.raise_on_open_redirects = true
+
+# Change the variant processor for Active Storage.
+# Changing this default means updating all places in your code that
+# generate variants to use image processing macros and ruby-vips
+# operations. See the upgrading guide for detail on the changes required.
+# The `:mini_magick` option is not deprecated; it's fine to keep using it.
+# Rails.application.config.active_storage.variant_processor = :vips
+
+# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
+# was `:marshal`. Convert all cookies to JSON, using the `:hybrid` formatter.
+#
+# If you're confident all your cookies are JSON formatted, you can switch to the `:json` formatter.
+#
+# Continue to use `:marshal` for backward-compatibility with old cookies.
+#
+# If you have configured the serializer elsewhere, you can remove this.
+#
+# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
+# Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+
+# Enable parameter wrapping for JSON.
+# Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
+# To disable parameter wrapping entirely, set this config to `false`.
+# Rails.application.config.action_controller.wrap_parameters_by_default = true
+
+# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
+# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
+#
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
+# more information.
+# Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
+
+# Change the default headers to disable browsers' flawed legacy XSS protection.
+# Rails.application.config.action_dispatch.default_headers = {
+#   "X-Frame-Options" => "SAMEORIGIN",
+#   "X-XSS-Protection" => "0",
+#   "X-Content-Type-Options" => "nosniff",
+#   "X-Download-Options" => "noopen",
+#   "X-Permitted-Cross-Domain-Policies" => "none",
+#   "Referrer-Policy" => "strict-origin-when-cross-origin"
+# }
diff --git a/db/migrate/20220224143190_create_active_storage_tables.active_storage.rb b/db/migrate/20220224143190_create_active_storage_tables.active_storage.rb
new file mode 100644
index 000000000..8a7bfe189
--- /dev/null
+++ b/db/migrate/20220224143190_create_active_storage_tables.active_storage.rb
@@ -0,0 +1,57 @@
+# This migration comes from active_storage (originally 20170806125915)
+class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+  def change
+    # Use Active Record's configured type for primary and foreign keys
+    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+
+    create_table :active_storage_blobs, id: primary_key_type do |t|
+      t.string   :key,          null: false
+      t.string   :filename,     null: false
+      t.string   :content_type
+      t.text     :metadata
+      t.string   :service_name, null: false
+      t.bigint   :byte_size,    null: false
+      t.string   :checksum
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :key ], unique: true
+    end
+
+    create_table :active_storage_attachments, id: primary_key_type do |t|
+      t.string     :name,     null: false
+      t.references :record,   null: false, polymorphic: true, index: false, type: foreign_key_type
+      t.references :blob,     null: false, type: foreign_key_type
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
+
+      t.index [ :record_type, :record_id, :name, :blob_id ], name: :index_active_storage_attachments_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+
+    create_table :active_storage_variant_records, id: primary_key_type do |t|
+      t.belongs_to :blob, null: false, index: false, type: foreign_key_type
+      t.string :variation_digest, null: false
+
+      t.index [ :blob_id, :variation_digest ], name: :index_active_storage_variant_records_uniqueness, unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_and_foreign_key_types
+      config = Rails.configuration.generators
+      setting = config.options[config.orm][:primary_key_type]
+      primary_key_type = setting || :primary_key
+      foreign_key_type = setting || :bigint
+      [primary_key_type, foreign_key_type]
+    end
+end
diff --git a/db/migrate/20220224143200_create_active_storage_variant_records.active_storage.rb b/db/migrate/20220224143200_create_active_storage_variant_records.active_storage.rb
new file mode 100644
index 000000000..a9766d6f9
--- /dev/null
+++ b/db/migrate/20220224143200_create_active_storage_variant_records.active_storage.rb
@@ -0,0 +1,25 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.0]
+  def change
+    # Use Active Record's configured type for primary key
+    create_table :active_storage_variant_records, id: primary_key_type, if_not_exists: true do |t|
+      t.belongs_to :blob, null: false, index: false, type: blobs_primary_key_type
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness", unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+
+  private
+    def primary_key_type
+      config = Rails.configuration.generators
+      config.options[config.orm][:primary_key_type] || :primary_key
+    end
+
+    def blobs_primary_key_type
+      pkey_name = connection.primary_key(:active_storage_blobs)
+      pkey_column = connection.columns(:active_storage_blobs).find { |c| c.name == pkey_name }
+      pkey_column.bigint? ? :bigint : pkey_column.type
+    end
+end
diff --git a/db/migrate/20220224143205_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb b/db/migrate/20220224143205_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
new file mode 100644
index 000000000..da8f3f14e
--- /dev/null
+++ b/db/migrate/20220224143205_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb
@@ -0,0 +1,6 @@
+# This migration comes from active_storage (originally 20211119233751)
+class RemoveNotNullOnActiveStorageBlobsChecksum < ActiveRecord::Migration[6.0]
+  def change
+    change_column_null(:active_storage_blobs, :checksum, true)
+  end
+end
diff --git a/db/migrate/20220224144260_add_service_name_to_active_storage_blobs.active_storage.rb b/db/migrate/20220224144260_add_service_name_to_active_storage_blobs.active_storage.rb
new file mode 100644
index 000000000..9967a1323
--- /dev/null
+++ b/db/migrate/20220224144260_add_service_name_to_active_storage_blobs.active_storage.rb
@@ -0,0 +1,18 @@
+# This migration comes from active_storage (originally 20190112182829)
+class AddServiceNameToActiveStorageBlobs < ActiveRecord::Migration[6.0]
+  def up
+    unless column_exists?(:active_storage_blobs, :service_name)
+      add_column :active_storage_blobs, :service_name, :string
+
+      if configured_service = ActiveStorage::Blob.service.name
+        ActiveStorage::Blob.unscoped.update_all(service_name: configured_service)
+      end
+
+      change_column :active_storage_blobs, :service_name, :string, null: false
+    end
+  end
+
+  def down
+    remove_column :active_storage_blobs, :service_name
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index f2f46dd17..2c02a543f 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,16 +10,43 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_02_24_175428) do
-
+ActiveRecord::Schema[7.0].define(version: 2022_02_24_175428) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
+  create_table "active_storage_attachments", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+  end
+
+  create_table "active_storage_blobs", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.string "service_name", null: false
+    t.bigint "byte_size", null: false
+    t.string "checksum"
+    t.datetime "created_at", null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "active_storage_variant_records", force: :cascade do |t|
+    t.bigint "blob_id", null: false
+    t.string "variation_digest", null: false
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+  end
+
   create_table "barriers", force: :cascade do |t|
     t.string "name"
     t.text "description"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "collections", force: :cascade do |t|
@@ -32,8 +59,8 @@
     t.integer "user_id"
     t.string "integrity_hash"
     t.string "aasm_state"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "reflection"
     t.string "rating"
     t.integer "service_provider_id"
@@ -55,9 +82,9 @@
     t.text "long_description"
     t.text "notes"
     t.string "tags"
-    t.datetime "certified_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "certified_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "digital_service_accounts", force: :cascade do |t|
@@ -72,9 +99,9 @@
     t.text "long_description"
     t.text "notes"
     t.string "tags"
-    t.datetime "certified_at"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "certified_at", precision: nil
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "events", force: :cascade do |t|
@@ -83,8 +110,8 @@
     t.string "object_id", null: false
     t.string "description", null: false
     t.integer "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "form_sections", force: :cascade do |t|
@@ -92,8 +119,8 @@
     t.string "title"
     t.integer "position"
     t.integer "next_section_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "forms", force: :cascade do |t|
@@ -104,8 +131,8 @@
     t.string "kind"
     t.text "notes"
     t.string "status"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "whitelist_url", default: ""
     t.string "whitelist_test_url", default: ""
     t.boolean "display_header_logo", default: false
@@ -130,8 +157,8 @@
     t.string "department"
     t.string "bureau"
     t.string "notification_emails"
-    t.datetime "start_date"
-    t.datetime "end_date"
+    t.datetime "start_date", precision: nil
+    t.datetime "end_date", precision: nil
     t.string "aasm_state"
     t.string "delivery_method"
     t.string "element_selector"
@@ -143,7 +170,7 @@
     t.string "occasion"
     t.string "time_zone", default: "Eastern Time (US & Canada)"
     t.integer "response_count", default: 0
-    t.datetime "last_response_created_at"
+    t.datetime "last_response_created_at", precision: nil
     t.boolean "ui_truncate_text_responses", default: true
     t.string "success_text_heading"
     t.string "notification_frequency", default: "instant"
@@ -156,14 +183,14 @@
 
   create_table "goal_targets", force: :cascade do |t|
     t.integer "goal_id"
-    t.datetime "target_date_at"
+    t.datetime "target_date_at", precision: nil
     t.text "assertion"
     t.string "kpi"
     t.integer "starting_value"
     t.integer "target_value"
     t.integer "current_value"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "goals", force: :cascade do |t|
@@ -172,8 +199,8 @@
     t.text "description"
     t.string "tags", array: true
     t.integer "users", array: true
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "four_year_goal", default: false
     t.integer "parent_id"
     t.integer "position"
@@ -193,8 +220,8 @@
     t.date "due_date"
     t.string "status"
     t.text "notes"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
   create_table "objectives", force: :cascade do |t|
@@ -205,8 +232,8 @@
     t.integer "milestone_id"
     t.string "tags", array: true
     t.integer "users", array: true
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["tags"], name: "index_objectives_on_tags", using: :gin
     t.index ["users"], name: "index_objectives_on_users", using: :gin
   end
@@ -287,8 +314,8 @@
     t.integer "q11_3", default: 0
     t.integer "q11_4", default: 0
     t.integer "q11_5", default: 0
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.text "operational_metrics"
     t.integer "service_id"
     t.index ["collection_id"], name: "index_omb_cx_reporting_collections_on_collection_id"
@@ -318,8 +345,8 @@
     t.string "tags", array: true
     t.integer "user_id"
     t.text "notes"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["tags"], name: "index_personas_on_tags", using: :gin
   end
 
@@ -327,8 +354,8 @@
     t.integer "question_id"
     t.string "text"
     t.integer "position"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "value"
   end
 
@@ -339,8 +366,8 @@
     t.string "answer_field"
     t.integer "position"
     t.boolean "is_required"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.integer "form_section_id"
     t.integer "character_limit"
     t.string "placeholder_text"
@@ -352,8 +379,8 @@
     t.string "name"
     t.string "resource_type"
     t.bigint "resource_id"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["name", "resource_type", "resource_id"], name: "index_roles_on_name_and_resource_type_and_resource_id"
     t.index ["resource_type", "resource_id"], name: "index_roles_on_resource"
   end
@@ -368,8 +395,8 @@
     t.string "department_abbreviation"
     t.string "bureau"
     t.string "bureau_abbreviation"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.boolean "new"
     t.boolean "inactive"
     t.string "url"
@@ -378,8 +405,8 @@
   create_table "service_stage_barriers", force: :cascade do |t|
     t.integer "service_stage_id"
     t.integer "barrier_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "service_stages", force: :cascade do |t|
@@ -390,8 +417,8 @@
     t.integer "time"
     t.integer "total_eligible_population"
     t.integer "position"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "services", force: :cascade do |t|
@@ -399,8 +426,8 @@
     t.text "description"
     t.integer "organization_id"
     t.text "notes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "hisp", default: false
     t.string "department", default: ""
     t.string "bureau", default: ""
@@ -418,8 +445,8 @@
 
   create_table "submissions", force: :cascade do |t|
     t.integer "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.string "referer"
     t.string "page"
     t.string "user_agent"
@@ -462,7 +489,7 @@
     t.string "tagger_type"
     t.integer "tagger_id"
     t.string "context", limit: 128
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.string "tenant", limit: 128
     t.index ["context"], name: "index_taggings_on_context"
     t.index ["tag_id", "taggable_id", "taggable_type", "context", "tagger_id", "tagger_type"], name: "taggings_idx", unique: true
@@ -478,8 +505,8 @@
 
   create_table "tags", id: :serial, force: :cascade do |t|
     t.string "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "taggings_count", default: 0
     t.index ["name"], name: "index_tags_on_name", unique: true
   end
@@ -488,8 +515,8 @@
     t.integer "user_id", null: false
     t.integer "form_id"
     t.string "role"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
   create_table "users", force: :cascade do |t|
@@ -497,26 +524,26 @@
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at", precision: nil
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.inet "current_sign_in_ip"
     t.inet "last_sign_in_ip"
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
     t.boolean "admin", default: false
     t.string "provider"
     t.string "uid"
     t.boolean "inactive"
     t.string "time_zone", default: "Eastern Time (US & Canada)"
     t.string "api_key"
-    t.datetime "api_key_updated_at"
+    t.datetime "api_key_updated_at", precision: nil
     t.boolean "organizational_website_manager", default: false
     t.boolean "performance_manager", default: false
     t.boolean "registry_manager", default: false
@@ -544,7 +571,7 @@
     t.string "event", null: false
     t.string "whodunnit"
     t.text "object"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.text "object_changes"
     t.index ["item_type", "item_id"], name: "index_versions_on_item_type_and_item_id"
   end
@@ -580,8 +607,8 @@
     t.boolean "has_authenticated_experience"
     t.string "authentication_tool"
     t.text "notes"
-    t.datetime "created_at", precision: 6, null: false
-    t.datetime "updated_at", precision: 6, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.string "repository_url"
     t.string "hosting_platform"
     t.float "modernization_cost_2021"
@@ -593,5 +620,7 @@
     t.index ["service_id"], name: "index_websites_on_service_id"
   end
 
+  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
   add_foreign_key "taggings", "tags"
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index c9cbb46d7..3a84901c6 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,13 +1,13 @@
 def production_suitable_seeds
   @gsa = Organization.create!({
-    name: "General Services Administration",
-    abbreviation: "GSA",
-    domain: "gsa.gov",
-    url: "https://gsa.gov",
-    digital_analytics_path: "general-services-administration",
-    mission_statement: "Declaring the purpose of an organization and how it serves customers"
+    name: 'General Services Administration',
+    abbreviation: 'GSA',
+    domain: 'gsa.gov',
+    url: 'https://gsa.gov',
+    digital_analytics_path: 'general-services-administration',
+    mission_statement: 'Declaring the purpose of an organization and how it serves customers'
   })
-  puts "Created Organization: #{@gsa.name}"
+  puts 'Created Organization: #{@gsa.name}'
 end
 
 production_suitable_seeds
@@ -24,89 +24,89 @@ def production_suitable_seeds
 
 # Create Seeds
 
-if ENV["DEVELOPER_EMAIL_ADDRESS"].present?
+if ENV['DEVELOPER_EMAIL_ADDRESS'].present?
   #assumes email addresses in the form user@domain
-  domain = ENV["DEVELOPER_EMAIL_ADDRESS"].split("@")[1]
+  domain = ENV['DEVELOPER_EMAIL_ADDRESS'].split('@')[1]
   developer_organization = Organization.create!({
-    name: "Development Org",
+    name: 'Development Org',
     domain: domain,
-    url: "https://lvh.me",
-    abbreviation: "DEV"
+    url: 'https://lvh.me',
+    abbreviation: 'DEV'
   })
-  puts "Created Default Organization: #{developer_organization.name}"
+  puts 'Created Default Organization: #{developer_organization.name}'
 
   developer_user = User.new({
     organization: developer_organization,
-    email: ENV["DEVELOPER_EMAIL_ADDRESS"],
-    password: "password",
+    email: ENV['DEVELOPER_EMAIL_ADDRESS'],
+    password: 'password',
     admin: true
   })
   developer_user.save!
-  puts "Created Developer User: #{developer_user.email}"
+  puts 'Created Developer User: #{developer_user.email}'
 end
 
 example_gov = Organization.create!({
-  name: "Example.gov",
-  domain: "example.gov",
-  url: "https://example.gov",
-  abbreviation: "EX"
+  name: 'Example.gov',
+  domain: 'example.gov',
+  url: 'https://example.gov',
+  abbreviation: 'EX'
 })
-puts "Created Default Organization: #{example_gov.name}"
+puts 'Created Default Organization: #{example_gov.name}'
 
 admin_user = User.new({
   organization: example_gov,
-  email: "ryan.wold+staging@gsa.gov",
-  password: "password",
+  email: 'ryan.wold+staging@gsa.gov',
+  password: 'password',
   admin: true
 })
 admin_user.save!
-puts "Created Admin User: #{admin_user.email}"
+puts 'Created Admin User: #{admin_user.email}'
 
 digital_gov = Organization.create!({
-  name: "Digital.gov",
-  domain: "digital.gov",
-  url: "https://digital.gov",
-  abbreviation: "DIGITAL"
+  name: 'Digital.gov',
+  domain: 'digital.gov',
+  url: 'https://digital.gov',
+  abbreviation: 'DIGITAL'
 })
-puts "Creating additional Organization: #{digital_gov.name}"
+puts 'Creating additional Organization: #{digital_gov.name}'
 
 org_2 = Organization.create!({
-  name: "Farmers.gov",
-  domain: "example.gov",
-  url: "https://farmers.gov",
-  abbreviation: "FARMERS"
+  name: 'Farmers.gov',
+  domain: 'example.gov',
+  url: 'https://farmers.gov',
+  abbreviation: 'FARMERS'
 })
 
 org_3 = Organization.create!({
-  name: "Cloud.gov",
-  domain: "cloud.gov",
-  url: "https://cloud.gov",
-  abbreviation: "CLOUD"
+  name: 'Cloud.gov',
+  domain: 'cloud.gov',
+  url: 'https://cloud.gov',
+  abbreviation: 'CLOUD'
 })
 
 webmaster = User.new({
-  email: "webmaster@example.gov",
-  password: "password",
+  email: 'webmaster@example.gov',
+  password: 'password',
   organization: example_gov
 })
 webmaster.save!
-puts "Created #{webmaster.email}"
+puts 'Created #{webmaster.email}'
 
 touchpoint_manager = User.new({
-  email: "touchpoint_manager@example.gov",
-  password: "password",
+  email: 'touchpoint_manager@example.gov',
+  password: 'password',
   organization: example_gov
 })
 touchpoint_manager.save!
-puts "Created #{touchpoint_manager.email}"
+puts 'Created #{touchpoint_manager.email}'
 
 submission_viewer = User.new({
-  email: "viewer@example.gov",
-  password: "password",
+  email: 'viewer@example.gov',
+  password: 'password',
   organization: example_gov
 })
 submission_viewer.save!
-puts "Created #{submission_viewer.email}"
+puts 'Created #{submission_viewer.email}'
 
 # Forms
 
@@ -114,22 +114,22 @@ def production_suitable_seeds
 open_ended_form = Form.create!({
   organization: example_gov,
   template: true,
-  kind: "open ended",
-  notes: "An open-ended Feedback Form useful for general website and program feedback.",
+  kind: 'open ended',
+  notes: 'An open-ended Feedback Form useful for general website and program feedback.',
   user: admin_user,
-  name: "Open-ended Feedback",
-  title: "Custom Open-ended Title",
-  instructions: "Share feedback about the new example.gov website and recommend additional features.",
-  disclaimer_text: "Disclaimer Text Goes Here",
-  delivery_method: "modal",
-  modal_button_text: "Click here to leave feedback"
+  name: 'Open-ended Feedback',
+  title: 'Custom Open-ended Title',
+  instructions: 'Share feedback about the new example.gov website and recommend additional features.',
+  disclaimer_text: 'Disclaimer Text Goes Here',
+  delivery_method: 'modal',
+  modal_button_text: 'Click here to leave feedback'
 
 })
 Question.create!({
   form: open_ended_form,
   form_section: open_ended_form.form_sections.first,
-  text: "How can we improve this website to better meet your needs?",
-  question_type: "textarea",
+  text: 'How can we improve this website to better meet your needs?',
+  question_type: 'textarea',
   position: 1,
   answer_field: :answer_01,
   is_required: true,
@@ -139,21 +139,21 @@ def production_suitable_seeds
 recruiter_form = Form.create({
   organization: example_gov,
   template: true,
-  kind: "recruiter",
-  notes: "A form useful for recruiting users to participate in research.",
+  kind: 'recruiter',
+  notes: 'A form useful for recruiting users to participate in research.',
   user: admin_user,
-  name: "Recruiter",
-  title: "",
-  instructions: "",
-  disclaimer_text: "Disclaimer Text Goes Here",
-  delivery_method: "modal",
-  modal_button_text: "Click here to leave feedback"
+  name: 'Recruiter',
+  title: '',
+  instructions: '',
+  disclaimer_text: 'Disclaimer Text Goes Here',
+  delivery_method: 'modal',
+  modal_button_text: 'Click here to leave feedback'
 })
 Question.create!({
   form: recruiter_form,
   form_section: recruiter_form.form_sections.first,
-  text: "Name",
-  question_type: "text_field",
+  text: 'Name',
+  question_type: 'text_field',
   position: 1,
   answer_field: :answer_01,
   is_required: false,
@@ -161,8 +161,8 @@ def production_suitable_seeds
 Question.create!({
   form: recruiter_form,
   form_section: recruiter_form.form_sections.first,
-  text: "Email",
-  question_type: "text_field",
+  text: 'Email',
+  question_type: 'text_field',
   position: 2,
   answer_field: :answer_02,
   is_required: false,
@@ -170,8 +170,8 @@ def production_suitable_seeds
 Question.create!({
   form: recruiter_form,
   form_section: recruiter_form.form_sections.first,
-  text: "Phone Number",
-  question_type: "text_field",
+  text: 'Phone Number',
+  question_type: 'text_field',
   position: 3,
   answer_field: :answer_03,
   is_required: false,
@@ -180,21 +180,21 @@ def production_suitable_seeds
 open_ended_form_with_contact_information = Form.create({
   organization: example_gov,
   template: true,
-  kind: "open ended with contact information",
-  notes: "An open-ended feedback form with information to follow up with the user.",
+  kind: 'open ended with contact information',
+  notes: 'An open-ended feedback form with information to follow up with the user.',
   user: admin_user,
-  name: "Open Ended Form with Contact Information",
-  title: "",
-  instructions: "",
-  disclaimer_text: "Disclaimer Text Goes Here",
-  delivery_method: "modal",
-  modal_button_text: "Click here to leave feedback"
+  name: 'Open Ended Form with Contact Information',
+  title: '',
+  instructions: '',
+  disclaimer_text: 'Disclaimer Text Goes Here',
+  delivery_method: 'modal',
+  modal_button_text: 'Click here to leave feedback'
 })
 Question.create!({
   form: open_ended_form_with_contact_information,
   form_section: open_ended_form_with_contact_information.form_sections.first,
-  text: "How can we improve this website to better meet your needs?",
-  question_type: "textarea",
+  text: 'How can we improve this website to better meet your needs?',
+  question_type: 'textarea',
   position: 1,
   answer_field: :answer_01,
   is_required: true,
@@ -202,8 +202,8 @@ def production_suitable_seeds
 Question.create!({
   form: open_ended_form_with_contact_information,
   form_section: open_ended_form_with_contact_information.form_sections.first,
-  text: "Name",
-  question_type: "text_field",
+  text: 'Name',
+  question_type: 'text_field',
   position: 1,
   answer_field: :answer_02,
   is_required: false,
@@ -211,8 +211,8 @@ def production_suitable_seeds
 Question.create!({
   form: open_ended_form_with_contact_information,
   form_section: open_ended_form_with_contact_information.form_sections.first,
-  text: "Email",
-  question_type: "text_field",
+  text: 'Email',
+  question_type: 'text_field',
   position: 2,
   answer_field: :answer_03,
   is_required: false,
@@ -269,26 +269,26 @@ def production_suitable_seeds
 
 Submission.create!({
   form: open_ended_form,
-  answer_01: "Body text"
+  answer_01: 'Body text'
 })
 
 Submission.create!({
   form: open_ended_form,
-  answer_01: "Another body text " * 20
+  answer_01: 'Another body text ' * 20
 })
 
 Submission.create!({
   form: recruiter_form,
-  answer_01: "Mary",
-  answer_02: "Public",
-  answer_03: "public_user_3@example.com",
-  answer_04: "5555550000"
+  answer_01: 'Mary',
+  answer_02: 'Public',
+  answer_03: 'public_user_3@example.com',
+  answer_04: '5555550000'
 })
 
 100.times do |i|
   Submission.create!({
     form: open_ended_form,
-    answer_01: "Body text"
+    answer_01: 'Body text'
   })
 end
 
@@ -309,14 +309,14 @@ def production_suitable_seeds
 end
 
 digital_gov_user = User.new({
-  email: "user@digital.gov",
-  password: "password"
+  email: 'user@digital.gov',
+  password: 'password'
 })
 digital_gov_user.save!
-puts "Created Test User in Secondary Organization: #{digital_gov_user.email}"
+puts 'Created Test User in Secondary Organization: #{digital_gov_user.email}'
 
 ## Generate admin
-admin_emails = ENV.fetch("TOUCHPOINTS_ADMIN_EMAILS").split(",")
+admin_emails = ENV.fetch('TOUCHPOINTS_ADMIN_EMAILS').split(',')
 admin_emails.each do |email|
   User.new({
     email: email.strip,
@@ -328,105 +328,105 @@ def production_suitable_seeds
 
 service_provider_1 = ServiceProvider.create({
   organization: example_gov,
-  name: "Example HISP",
-  description: "Description for an example HISP",
-  notes: "notes for example HISP",
-  department: "Example Department",
-  department_abbreviation: "dept",
-  bureau: "Example Bureau",
-  bureau_abbreviation: "bureau",
-  slug: "example-service1",
+  name: 'Example HISP',
+  description: 'Description for an example HISP',
+  notes: 'notes for example HISP',
+  department: 'Example Department',
+  department_abbreviation: 'dept',
+  bureau: 'Example Bureau',
+  bureau_abbreviation: 'bureau',
+  slug: 'example-service1',
   new: false,
 })
 
 service_provider_2 = ServiceProvider.create({
   organization: example_gov,
-  name: "Example High Impact Service Provider - example.gov",
-  description: "A Description of the Example HISP",
-  notes: "notes on the example.gov HISP",
-  department: "Example",
-  department_abbreviation: "ex",
-  bureau: "CX Labs",
-  bureau_abbreviation: "labs",
-  slug: "example-service2",
+  name: 'Example High Impact Service Provider - example.gov',
+  description: 'A Description of the Example HISP',
+  notes: 'notes on the example.gov HISP',
+  department: 'Example',
+  department_abbreviation: 'ex',
+  bureau: 'CX Labs',
+  bureau_abbreviation: 'labs',
+  slug: 'example-service2',
   new: false,
 })
 
 service_provider_3 = ServiceProvider.create({
   organization: Organization.first,
-  name: "GSA High Impact Service Provider - USA.gov",
-  description: "A Description of the USA.gov HISP",
-  notes: "notes on the usa.gov HISP",
-  department: "General Services Administration",
-  department_abbreviation: "gsa",
-  bureau: "Technology Transformation Services",
-  bureau_abbreviation: "tts",
-  slug: "gsa-usagov",
+  name: 'GSA High Impact Service Provider - USA.gov',
+  description: 'A Description of the USA.gov HISP',
+  notes: 'notes on the usa.gov HISP',
+  department: 'General Services Administration',
+  department_abbreviation: 'gsa',
+  bureau: 'Technology Transformation Services',
+  bureau_abbreviation: 'tts',
+  slug: 'gsa-usagov',
   new: true,
 })
 
 ## Services
 
 service_1 = Service.create({
-  name: "USPTO Trademarks",
+  name: 'USPTO Trademarks',
   organization: Organization.first,
   hisp: true,
-  notes: "Headline notes about the service",
-  description: "A blurb describing this service. A few hundred words...",
-  department: "Department of Commerce",
-  bureau: "Patents and Trademarks",
-  bureau_abbreviation: "trademarks",
-  service_abbreviation: "uspto",
-  service_slug: "doc-trademarks",
-  url: "https://uspto.gov/trademarks",
+  notes: 'Headline notes about the service',
+  description: 'A blurb describing this service. A few hundred words...',
+  department: 'Department of Commerce',
+  bureau: 'Patents and Trademarks',
+  bureau_abbreviation: 'trademarks',
+  service_abbreviation: 'uspto',
+  service_slug: 'doc-trademarks',
+  url: 'https://uspto.gov/trademarks',
   service_provider: service_provider_1,
 })
 service_2 = Service.create({
   organization: service_provider_2.organization,
   service_provider: service_provider_2,
-  name: "Example",
+  name: 'Example',
   hisp: true,
 })
 service_3 = Service.create({
   organization: Organization.first,
   service_provider: service_provider_2,
-  name: "HUD",
+  name: 'HUD',
   hisp: true,
 })
 service_4 = Service.create({
   organization: Organization.first,
   service_provider: service_provider_3,
-  name: "IRS",
+  name: 'IRS',
   hisp: true,
   })
 service_5 = Service.create({
   organization: Organization.first,
   service_provider: nil,
-  name: "Touchpoints",
+  name: 'Touchpoints',
   hisp: false,
 })
 
 stage_before = ServiceStage.create({
-  name: "Before",
+  name: 'Before',
   service: service_1
 })
 stage_during = ServiceStage.create({
-  name: "During",
+  name: 'During',
   service: service_1
 })
 stage_after = ServiceStage.create({
-  name: "After",
+  name: 'After',
   service: service_1
 })
 
 barrier_1 = Barrier.create({
-  name: "technical"
+  name: 'technical'
 })
 barrier_2 = Barrier.create({
-  name: "policy"
+  name: 'policy'
 })
 barrier_3 = Barrier.create({
-  name: "location"
+  name: 'location'
 })
 ServiceStageBarrier.create({
   service_stage: stage_before,
@@ -442,32 +442,32 @@ def production_suitable_seeds
 })
 
 Website.create!({
-  domain: "gsa.gov",
-  type_of_site: "Informational",
-  production_status: "production"
+  domain: 'gsa.gov',
+  type_of_site: 'Informational',
+  production_status: 'production'
 })
 
 Website.create!({
-  domain: "digital.gov",
-  type_of_site: "Informational",
-  production_status: "production"
+  domain: 'digital.gov',
+  type_of_site: 'Informational',
+  production_status: 'production'
 })
 
 Website.create!({
-  domain: "touchpoints.digital.gov",
-  type_of_site: "Application",
-  production_status: "production"
+  domain: 'touchpoints.digital.gov',
+  type_of_site: 'Application',
+  production_status: 'production'
 })
 
 Website.create!({
-  domain: "subdomain.digital.gov",
-  type_of_site: "Application",
-  production_status: "production"
+  domain: 'subdomain.digital.gov',
+  type_of_site: 'Application',
+  production_status: 'production'
 })
 Website.create!({
-  domain: "subdomain.gsa.gov",
-  type_of_site: "Application",
-  production_status: "production"
+  domain: 'subdomain.gsa.gov',
+  type_of_site: 'Application',
+  production_status: 'production'
 })
 
 data_collection = Collection.create!({
@@ -476,10 +476,10 @@ def production_suitable_seeds
   user: User.all.sample,
   year: 2021,
   quarter: 2,
-  name: "CX Quarterly Data Collection",
-  start_date: "2021-01-01",
-  end_date: "2021-03-31",
-  rating: "TRUE",
+  name: 'CX Quarterly Data Collection',
+  start_date: '2021-01-01',
+  end_date: '2021-03-31',
+  rating: 'TRUE',
 })
 
 data_collection = Collection.create!({
@@ -488,10 +488,10 @@ def production_suitable_seeds
   user: User.all.sample,
   year: 2021,
   quarter: 3,
-  name: "CX Quarterly Data Collection",
-  start_date: "2021-04-01",
-  end_date: "2021-06-30",
-  rating: "FALSE",
+  name: 'CX Quarterly Data Collection',
+  start_date: '2021-04-01',
+  end_date: '2021-06-30',
+  rating: 'FALSE',
 })
 
 data_collection = Collection.create!({
@@ -500,10 +500,10 @@ def production_suitable_seeds
   user: User.all.sample,
   year: 2021,
   quarter: 1,
-  name: "CX Quarterly Data Collection",
-  start_date: "2020-10-31",
-  end_date: "2020-12-31",
-  rating: "PARTIAL",
+  name: 'CX Quarterly Data Collection',
+  start_date: '2020-10-31',
+  end_date: '2020-12-31',
+  rating: 'PARTIAL',
 })
 
 data_collection = Collection.create!({
@@ -512,10 +512,10 @@ def production_suitable_seeds
   user: User.all.sample,
   year: 2021,
   quarter: 2,
-  name: "CX Quarterly Data Collection",
-  start_date: "2021-01-01",
-  end_date: "2021-03-31",
-  rating: "PARTIAL",
+  name: 'CX Quarterly Data Collection',
+  start_date: '2021-01-01',
+  end_date: '2021-03-31',
+  rating: 'PARTIAL',
 })
 
 data_collection = Collection.create!({
@@ -524,10 +524,10 @@ def production_suitable_seeds
   user: User.all.sample,
   year: 2021,
   quarter: 3,
-  name: "CX Quarterly Data Collection",
-  start_date: "2021-04-01",
-  end_date: "2021-06-30",
-  rating: "PARTIAL",
+  name: 'CX Quarterly Data Collection',
+  start_date: '2021-04-01',
+  end_date: '2021-06-30',
+  rating: 'PARTIAL',
 })
 
 data_collection = Collection.create!({
@@ -536,54 +536,54 @@ def production_suitable_seeds
   user: User.all.sample,
   year: 2021,
   quarter: 4,
-  name: "CX Quarterly Data Collection",
-  start_date: "2021-07-01",
-  end_date: "2021-09-30",
-  rating: "PARTIAL",
+  name: 'CX Quarterly Data Collection',
+  start_date: '2021-07-01',
+  end_date: '2021-09-30',
+  rating: 'PARTIAL',
 })
 
 
 OmbCxReportingCollection.create!({
   collection: data_collection,
   service: service_1,
-  service_provided: "Test CX Quarterly Reporting",
-  q1_text: "Question 1",
+  service_provided: 'Test CX Quarterly Reporting',
+  q1_text: 'Question 1',
   q1_1: rand(1000),
   q1_2: rand(1000),
   q1_3: rand(1000),
   q1_4: rand(1000),
   q1_5: rand(1000),
-  q2_text: "Question 2",
+  q2_text: 'Question 2',
   q2_1: rand(1000),
   q2_2: rand(1000),
   q2_3: rand(1000),
   q2_4: rand(1000),
   q2_5: rand(1000),
-  q3_text: "Question 3",
+  q3_text: 'Question 3',
   q3_1: rand(1000),
   q3_2: rand(1000),
   q3_3: rand(1000),
   q3_4: rand(1000),
   q3_5: rand(1000),
-  q4_text: "Question 4",
+  q4_text: 'Question 4',
   q4_1: rand(1000),
   q4_2: rand(1000),
   q4_3: rand(1000),
   q4_4: rand(1000),
   q4_5: rand(1000),
-  q5_text: "Question 5",
+  q5_text: 'Question 5',
   q5_1: rand(1000),
   q5_2: rand(1000),
   q5_3: rand(1000),
   q5_4: rand(1000),
   q5_5: rand(1000),
-  q6_text: "Question 6",
+  q6_text: 'Question 6',
   q6_1: rand(1000),
   q6_2: rand(1000),
   q6_3: rand(1000),
   q6_4: rand(1000),
   q6_5: rand(1000),
-  q7_text: "Question 7",
+  q7_text: 'Question 7',
   q7_1: rand(1000),
   q7_2: rand(1000),
   q7_3: rand(1000),
@@ -591,109 +591,3 @@ def production_suitable_seeds
   q7_5: rand(1000),
 })
 
-goal_1 = Goal.create!({
-  organization: @gsa,
-  name: "Example Goal 1",
-  tags: ["this", "that", "other"],
-  four_year_goal: true,
-  users: [1]
-})
-
-goal_2 = Goal.create!({
-  organization: @gsa,
-  name: "Example Goal 2",
-  tags: ["this", "that", "other", "unique"],
-  four_year_goal: true,
-  users: []
-})
-
-goal_3 = Goal.create!({
-  organization: example_gov,
-  name: "Example Goal 2",
-  tags: ["this", "that"],
-  four_year_goal: true,
-  users: []
-})
-
-apg_goal_1 = Goal.create!({
-  organization: @gsa,
-  name: "Example APG 1",
-  description: "Example APG Description 1",
-  tags: ["this", "that", "other"],
-  users: [1]
-})
-
-apg_goal_2 = Goal.create!({
-  organization: @gsa,
-  name: "Example APG 2",
-  description: "Example APG Description 2",
-  tags: ["this", "that", "other", "unique"],
-  users: []
-})
-
-apg_goal_3 = Goal.create!({
-  organization: @gsa,
-  name: "Example APG 2",
-  description: "Example APG Description 3",
-  tags: ["this", "that"],
-  users: []
-})
-
-milestone_1 = Milestone.create!({
-  organization: @gsa,
-  goal: goal_1,
-  name: "Milestone"
-})
-
-milestone_2 = Milestone.create!({
-  organization: @gsa,
-  goal: goal_2,
-  name: "Milestone for Goal 1"
-})
-
-milestone_3 = Milestone.create!({
-  organization: example_gov,
-  goal: goal_3,
-  name: "Milestone for Example.gov"
-})
-
-milestone_4 = Milestone.create!({
-  organization: @gsa,
-  goal: nil,
-  name: "Milestone not attached to a Goal"
-})
-
-objective_1 = Objective.create({
-  name: "Objective 1",
-  description: "Objective 1 description",
-  goal_id: goal_1.id,
-  tags: ["this", "that", "other"]
-})
-
-objective_1 = Objective.create({
-  name: "Objective 2",
-  description: "Objective 2 description",
-  goal_id: goal_1.id,
-  tags: ["this", "public", "another"]
-})
-
-objective_3 = Objective.create({
-  name: "Objective 3",
-  description: "Objective 3 description",
-  goal_id: goal_1.id,
-  tags: ["service", "that", "other"]
-})
-
-objective_4 = Objective.create({
-  name: "Objective 4",
-  description: "Objective 4 description",
-  goal_id: goal_2.id,
-  tags: ["this", "service", "other"]
-})
-
-objective_5 = Objective.create({
-  name: "Objective 5",
-  description: "Objective 5 description",
-  goal_id: goal_2.id,
-  tags: ["this", "that", "anoother"]
-})
diff --git a/docker-compose.yml b/docker-compose.yml
index d05c7a044..061491a6f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,33 +1,37 @@
-version: '2'
-
 services:
-  postgres:
-    image: 'postgres:10.3-alpine'
-    ports: 
-      - '5432:5432'
+  webapp:
+    build: .
+    command: bash -c "rm -f tmp/pids/server.pid && bin/rails s -p 3002 -b '0.0.0.0'"
     volumes:
-      - 'postgres:/var/lib/postgresql/data'
+      - .:/usr/src/app
+      - bundle:/usr/local/bundle
+    ports:
+      - "3002:3002"
     env_file:
-      - '.env'
-
-  redis:
-    image: 'redis:4.0-alpine'
-    command: redis-server --requirepass yourpassword
-    volumes:
-      - 'redis:/data'
-
-  website:
+      - .env
+    environment:
+      - PGHOST=db
+      - PGUSER=postgres
+      - PGPASSWORD=changeme
+      - HISTFILE=/usr/src/app/log/.bash_history
     depends_on:
-      - 'postgres'
-      - 'redis'
-    build: .
+      - redis
+      - db
+  db:
+    container_name: 'db'
+    image: postgres:13
     ports:
-      - '3000:3000'
+      - "5432:5432"
+    environment:
+      - POSTGRES_PASSWORD=changeme
     volumes:
-      - '.:/touchpoints'
-    env_file:
-      - '.env'
+      - pg_data:/var/lib/postgresql/data
+  redis:
+    image: redis
+    volumes:
+      - redis_data:/data
 
 volumes:
-  redis:
-  postgres:      
\ No newline at end of file
+  pg_data:
+  redis_data:
+  bundle:
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 000000000..329394d38
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+# Remove a potentially pre-existing server.pid for Rails.
+rm -f /usr/src/app/tmp/pids/server.pid
+
+echo "bundle install..."
+bundle check || bundle install --jobs 4
+
+# Then exec the container's main process (what's set as CMD in the Dockerfile).
+exec "$@"
diff --git a/package.json b/package.json
index 318cd9e5d..7b189b1a1 100644
--- a/package.json
+++ b/package.json
@@ -2,9 +2,9 @@
   "name": "touchpoints",
   "private": true,
   "dependencies": {
-    "@rails/actioncable": "^6.1.5",
-    "@rails/activestorage": "^6.1.5",
-    "@rails/ujs": "^6.1.5"
+    "@rails/actioncable": "^7.0.2.2",
+    "@rails/activestorage": "^7.0.2.2",
+    "@rails/ujs": "^7.0.2.2"
   },
   "version": "0.1.0",
   "devDependencies": {
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 30a33c4dc..1f85f730a 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -7,6 +7,7 @@
 require 'rspec/rails'
 require 'capybara/rails'
 require 'capybara/rspec'
+require 'selenium/webdriver'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in