diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 78750fbd..a188faf7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ['2.7.5']
+        ruby-version: ['2.7.7']
     steps:
     - name: Pin chrome
       uses: abhi1693/setup-browser@v0.3.4
@@ -54,13 +54,15 @@ jobs:
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}
-        bundler: "2.1.4"
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+        bundler: "2.2.26"
     # TODO: Tempoary remove this update untill ruby 3
     # - name: Update rubygems
     #   run: |
     #     gem update --system
-    #     gem install bundler:2.1.4
+    #     gem install bundler:2.2.26
+    - name: run bundle install
+      run: |
+        bundle install
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
diff --git a/Dockerfile b/Dockerfile
index d0566277..0d16cd27 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7.5
+FROM ruby:2.7.7
 
 ARG RAILS_ENV
 ARG SECRET_KEY_BASE
@@ -14,7 +14,7 @@ ENV LC_ALL C.UTF-8
 
 # --allow-unauthenticated needed for yarn package
 RUN apt-get update && apt-get upgrade -y && \
-  apt-get install --no-install-recommends -y ca-certificates nodejs \
+  apt-get install --no-install-recommends -y ca-certificates \
   build-essential libpq-dev libreoffice unzip ghostscript vim \
   ffmpeg \
   clamav-freshclam clamav-daemon libclamav-dev \
@@ -22,8 +22,21 @@ RUN apt-get update && apt-get upgrade -y && \
 
 RUN apt-get install chromium -y
 
+# Install Node.js 16
+RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
+  apt-get install -y nodejs
+
+# Remove cmdtest and yarn installed from the APT repository
+RUN apt-get remove -y cmdtest yarn
+
+# Install Yarn globally using npm
+RUN npm install -g yarn
+
+# Remove imagemagick
+RUN apt-get remove -y imagemagick
+
 RUN apt-get install -y wget
-RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t" # https://github.com/SoftCreatR/imei#one-step-automated-install
+# RUN t=$(mktemp) && wget 'https://dist.1-2.dev/imei.sh' -qO "$t" && bash "$t" && rm "$t" # https://github.com/SoftCreatR/imei#one-step-automated-install
 
 # fetch clamav local database
 # initial update of av databases
@@ -38,7 +51,7 @@ ENV PATH /opt/fits:$PATH
 # Increase stack size limit to help working with large works
 ENV RUBY_THREAD_MACHINE_STACK_SIZE 8388608
 
-RUN gem update --system
+RUN gem update --system 3.3.27
 
 RUN mkdir /data
 WORKDIR /data
@@ -46,7 +59,7 @@ WORKDIR /data
 # Pre-install gems so we aren't reinstalling all the gems when literally any
 # filesystem change happens
 ADD Gemfile /data
-ADD Gemfile.lock /data
+# ADD Gemfile.lock /data
 RUN mkdir /data/build
 ADD ./build/install_gems.sh /data/build
 RUN ./build/install_gems.sh
@@ -55,4 +68,4 @@ RUN ./build/install_gems.sh
 ADD . /data
 
 # install node dependencies, after there are some included
-#RUN yarn install
+RUN yarn install
diff --git a/Gemfile b/Gemfile
index f80fa11c..84259142 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 source 'https://rubygems.org'
 
-ruby '2.7.5'
+ruby '2.7.7'
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
@@ -15,7 +15,7 @@ gem 'exiftool_vendored'
 # gem 'fedora-migrate', path: '../fedora-migrate'
 gem 'fastimage'
 gem 'hydra-role-management'
-gem 'hyrax', '~> 2.9'
+gem 'hyrax', '3.6.0'
 gem 'mimemagic', '0.3.10'
 gem 'nokogiri', '>=1.8.2' # 1.8.2 fixes security issue https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15412
 gem 'okcomputer'
@@ -47,9 +47,10 @@ gem 'blacklight', '6.24.0'
 gem 'blacklight_advanced_search'
 gem 'omniauth', '1.9.1'
 gem 'omniauth-shibboleth'
+gem 'sprockets', '3.7.2'
 gem 'whenever', require: false
 
-gem 'tufts-curation', git: 'https://github.com/TuftsUniversity/tufts-curation', tag: 'v1.3.4'
+gem 'tufts-curation', git: 'https://github.com/TuftsUniversity/tufts-curation', tag: 'v2.0.0'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger  console
diff --git a/Gemfile.lock b/Gemfile.lock
index dfabf18d..3d36142a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,55 +6,54 @@ GIT
 
 GIT
   remote: https://github.com/TuftsUniversity/tufts-curation
-  revision: dca6e64f42be22ff4ddc1266de92ee9cb98080dc
-  tag: v1.3.4
+  revision: 720511f828f95f71a48ad21ca53b4f83e49c66a5
+  tag: v2.0.0
   specs:
-    tufts-curation (1.3.4)
-      active-fedora (>= 11.5, <= 12.99)
+    tufts-curation (0.1.0)
       activerecord
       activesupport
       chronic
-      hyrax (>= 2.1.0, <= 2.9.9)
+      hyrax (>= 3.0, < 3.99)
+      solrizer
 
 GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.0.3)
-    actioncable (5.2.8)
-      actionpack (= 5.2.8)
+    actioncable (5.2.8.1)
+      actionpack (= 5.2.8.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.8)
-      actionpack (= 5.2.8)
-      actionview (= 5.2.8)
-      activejob (= 5.2.8)
+    actionmailer (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.8)
-      actionview (= 5.2.8)
-      activesupport (= 5.2.8)
+    actionpack (5.2.8.1)
+      actionview (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.8)
-      activesupport (= 5.2.8)
+    actionview (5.2.8.1)
+      activesupport (= 5.2.8.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active-fedora (12.2.4)
+    active-fedora (13.3.0)
       active-triples (>= 0.11.0, < 2.0.0)
-      activemodel (>= 4.2.10, < 5.3)
-      activesupport (>= 4.2.4, < 5.3)
+      activemodel (>= 5.1)
+      activesupport (>= 5.1)
       deprecation
       faraday (~> 0.12)
-      faraday-encoding (= 0.0.4)
+      faraday-encoding (>= 0.0.5)
       ldp (>= 0.7.0, < 2)
-      rdf-vocab (< 3.1.5)
       rsolr (>= 1.1.2, < 3)
       ruby-progressbar (~> 1.0)
-    active-triples (1.1.1)
+    active-triples (1.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rdf (>= 2.0.2, < 4.0)
@@ -65,65 +64,65 @@ GEM
     active_job_status (1.2.1)
       activejob (> 4.2)
       activesupport (> 4.2)
-    activejob (5.2.8)
-      activesupport (= 5.2.8)
+    activejob (5.2.8.1)
+      activesupport (= 5.2.8.1)
       globalid (>= 0.3.6)
     activejob-uniqueness (0.2.0)
       activejob (>= 4.2, < 7)
       redlock (>= 1.2, < 2)
-    activemodel (5.2.8)
-      activesupport (= 5.2.8)
-    activemodel-serializers-xml (1.0.2)
-      activemodel (> 5.x)
-      activesupport (> 5.x)
+    activemodel (5.2.8.1)
+      activesupport (= 5.2.8.1)
+    activemodel-serializers-xml (1.0.3)
+      activemodel (>= 5.0.0.a)
+      activesupport (>= 5.0.0.a)
       builder (~> 3.1)
-    activerecord (5.2.8)
-      activemodel (= 5.2.8)
-      activesupport (= 5.2.8)
+    activerecord (5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       arel (>= 9.0)
-    activerecord-import (1.2.0)
-      activerecord (>= 3.2)
-    activestorage (5.2.8)
-      actionpack (= 5.2.8)
-      activerecord (= 5.2.8)
+    activerecord-import (1.8.1)
+      activerecord (>= 4.2)
+    activestorage (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
       marcel (~> 1.0.0)
-    activesupport (5.2.8)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     afm (0.2.2)
     almond-rails (0.3.0)
       rails (>= 4.2)
-    amazing_print (1.4.0)
     arel (9.0.0)
     ast (2.4.2)
-    autoprefixer-rails (10.4.2.0)
+    autoprefixer-rails (10.4.19.0)
       execjs (~> 2)
-    awesome_nested_set (3.4.0)
-      activerecord (>= 4.0.0, < 7.0)
-    aws-eventstream (1.2.0)
-    aws-partitions (1.525.0)
-    aws-sdk-core (3.122.0)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.51.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.105.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    awesome_nested_set (3.7.0)
+      activerecord (>= 4.0.0, < 8.0)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.977.0)
+    aws-sdk-core (3.208.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.9)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.93.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.165.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
+    base64 (0.2.0)
     bcp47 (0.3.3)
       i18n
     bcrypt (3.1.13)
@@ -162,18 +161,17 @@ GEM
       actionpack (>= 5.0)
       activemodel (>= 5.0)
     breadcrumbs_on_rails (3.0.1)
-    browse-everything (1.1.2)
+    browse-everything (1.4.0)
       addressable (~> 2.5)
       aws-sdk-s3
-      dropbox_api (>= 0.1.10)
-      google-api-client (~> 0.23)
-      google_drive (>= 2.1, < 4)
-      googleauth (>= 0.6.6, < 1.0)
-      rails (>= 4.2, < 7.0)
+      dropbox_api (>= 0.1.20)
+      google-apis-drive_v3
+      googleauth (>= 0.6.6, < 2.0)
+      rails (>= 4.2, < 8.0)
       ruby-box
       signet (~> 0.8)
       typhoeus
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.0.1)
     cancancan (1.17.0)
     capybara (3.36.0)
@@ -191,11 +189,11 @@ GEM
     capybara-screenshot (1.0.23)
       capybara (>= 1.0, < 4)
       launchy
-    carrierwave (1.3.2)
+    carrierwave (1.3.4)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-      ssrf_filter (~> 1.0)
+      ssrf_filter (~> 1.0, < 1.1.0)
     childprocess (4.1.0)
     chronic (0.10.2)
     chunky_png (1.3.11)
@@ -208,11 +206,16 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.10)
-    connection_pool (2.2.5)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
     crass (1.0.6)
+    csv (3.3.0)
     database_cleaner (1.7.0)
+    date (3.3.4)
     declarative (0.0.20)
+    declarative-builder (0.1.0)
+      declarative-option (< 0.2.0)
+    declarative-option (0.1.0)
     deprecation (1.1.0)
       activesupport
     devise (4.7.1)
@@ -227,6 +230,12 @@ GEM
       devise (>= 3.4.1)
       net-ldap (>= 0.16.0)
     diff-lcs (1.4.4)
+    disposable (0.4.7)
+      declarative (>= 0.0.9, < 1.0.0)
+      declarative-builder (< 0.2.0)
+      declarative-option (< 0.2.0)
+      representable (>= 2.4.0, <= 3.1.0)
+      uber (< 0.2.0)
     docile (1.4.0)
     dotenv (2.7.2)
     dotenv-rails (2.7.2)
@@ -239,72 +248,77 @@ GEM
       activesupport (>= 5.0)
       request_store (>= 1.0)
       ruby2_keywords
-    dropbox_api (0.1.18)
-      faraday (<= 1.0)
+    dropbox_api (0.1.21)
+      faraday (< 3.0)
       oauth2 (~> 1.1)
-    dry-configurable (0.13.0)
-      concurrent-ruby (~> 1.0)
+    dry-configurable (0.16.1)
       dry-core (~> 0.6)
-    dry-container (0.9.0)
+      zeitwerk (~> 2.6)
+    dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-    dry-core (0.7.1)
+    dry-core (0.9.1)
       concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
     dry-equalizer (0.3.0)
-    dry-events (0.3.0)
+    dry-events (0.2.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
-    dry-inflector (0.2.1)
-    dry-initializer (3.0.4)
-    dry-logic (1.2.0)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+    dry-inflector (0.3.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.3.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 0.9, >= 0.9)
+      zeitwerk (~> 2.6)
     dry-matcher (0.9.0)
       dry-core (~> 0.4, >= 0.4.8)
     dry-monads (1.4.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.7)
-    dry-schema (1.8.0)
+    dry-schema (1.11.3)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.13, >= 0.13.0)
-      dry-core (~> 0.5, >= 0.5)
+      dry-configurable (~> 0.16, >= 0.16)
+      dry-core (~> 0.9, >= 0.9)
       dry-initializer (~> 3.0)
-      dry-logic (~> 1.0)
-      dry-types (~> 1.5)
-    dry-struct (1.4.0)
-      dry-core (~> 0.5, >= 0.5)
-      dry-types (~> 1.5)
+      dry-logic (~> 1.3)
+      dry-types (~> 1.6)
+      zeitwerk (~> 2.6)
+    dry-struct (1.5.2)
+      dry-core (~> 0.9, >= 0.9)
+      dry-types (~> 1.6)
       ice_nine (~> 0.11)
+      zeitwerk (~> 2.6)
     dry-transaction (0.13.3)
       dry-container (>= 0.2.8)
       dry-events (>= 0.1.0)
       dry-matcher (>= 0.7.0)
       dry-monads (>= 0.4.0)
-    dry-types (1.5.1)
+    dry-types (1.6.1)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 0.9, >= 0.9)
       dry-inflector (~> 0.1, >= 0.1.2)
-      dry-logic (~> 1.0, >= 1.0.2)
-    dry-validation (1.7.0)
+      dry-logic (~> 1.3, >= 1.3)
+      zeitwerk (~> 2.6)
+    dry-validation (1.9.0)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
-      dry-core (~> 0.5, >= 0.5)
+      dry-core (~> 0.9, >= 0.9)
       dry-initializer (~> 3.0)
-      dry-schema (~> 1.8, >= 1.8.0)
-    ebnf (2.3.1)
-      amazing_print (~> 1.4)
+      dry-schema (~> 1.11, >= 1.11.0)
+      zeitwerk (~> 2.6)
+    ebnf (2.3.5)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
       scanf (~> 1.0)
       sxp (~> 1.2)
-      unicode-types (~> 1.7)
+      unicode-types (~> 1.8)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    erubi (1.10.0)
-    ethon (0.15.0)
+    erubi (1.13.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
-    execjs (2.8.1)
+    execjs (2.9.1)
     exiftool (1.2.1)
       json
     exiftool_vendored (11.51.0)
@@ -314,28 +328,28 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (0.17.5)
+    faraday (0.17.6)
       multipart-post (>= 1.2, < 3)
-    faraday-encoding (0.0.4)
+    faraday-encoding (0.0.6)
       faraday
     fastimage (2.1.7)
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
     ffaker (2.11.0)
-    ffi (1.15.5)
-    flipflop (2.6.0)
+    ffi (1.17.0)
+    flipflop (2.7.1)
       activesupport (>= 4.0)
+      terminal-table (>= 1.8)
     flot-rails (0.0.7)
       jquery-rails
-    font-awesome-rails (4.7.0.7)
-      railties (>= 3.2, < 7)
-    gems (1.2.0)
-    globalid (1.0.0)
+    font-awesome-rails (4.7.0.8)
+      railties (>= 3.2, < 8.0)
+    geocoder (1.8.3)
+      base64 (>= 0.1.0)
+      csv (>= 3.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
-    google-apis-core (0.4.1)
+    google-apis-core (0.11.3)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -343,33 +357,17 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-      webrick
-    google-apis-discovery_v1 (0.7.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-drive_v3 (0.15.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google-apis-generator (0.4.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
-      google-apis-core (>= 0.4, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
-    google-apis-sheets_v4 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
-    google_drive (3.0.7)
-      google-apis-drive_v3 (>= 0.5.0, < 1.0.0)
-      google-apis-sheets_v4 (>= 0.4.0, < 1.0.0)
-      googleauth (>= 0.5.0, < 1.0.0)
-      nokogiri (>= 1.5.3, < 2.0.0)
-    googleauth (0.17.1)
-      faraday (>= 0.17.3, < 2.0)
+    google-apis-drive_v3 (0.46.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.15)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+      signet (>= 0.16, < 2.a)
+    haml (6.3.0)
+      temple (>= 0.8.2)
+      thor
       tilt
     hashery (2.1.2)
     hashie (5.0.0)
@@ -387,10 +385,10 @@ GEM
     hydra-core (11.0.7)
       hydra-access-controls (= 11.0.7)
       railties (>= 4.0.0, < 6)
-    hydra-derivatives (3.5.0)
-      active-fedora (>= 11.3.1, < 14)
+    hydra-derivatives (3.7.0)
+      active-fedora (>= 11.5.6, != 13.2.1, != 13.2.0, != 13.1.3, != 13.1.2, != 13.1.1, != 13.1.0, != 13.0.0, != 12.2.1, != 12.2.0, != 12.1.1, != 12.1.0, != 12.0.3, != 12.0.2, != 12.0.1, != 12.0.0)
       active_encode (~> 0.1)
-      activesupport (>= 4.0, < 6)
+      activesupport (>= 4.0, < 7)
       addressable (~> 2.5)
       deprecation
       mime-types (> 2.0, < 4.0)
@@ -410,47 +408,52 @@ GEM
       hydra-access-controls (= 11.0.7)
       hydra-core (= 11.0.7)
       rails (>= 5.2, < 6.1)
-    hydra-pcdm (1.1.0)
-      active-fedora (>= 10, < 14)
+    hydra-pcdm (1.3.0)
+      active-fedora (>= 10, < 15)
       mime-types (>= 1)
+      rdf-vocab
     hydra-role-management (1.0.0)
       blacklight
       bootstrap_form
       cancancan
-    hydra-works (1.2.0)
-      activesupport (>= 4.2.10, < 6.0)
-      hydra-derivatives (~> 3.0)
+    hydra-works (2.1.0)
+      activesupport (>= 5.2, < 7.1)
+      hydra-derivatives (~> 3.6)
       hydra-file_characterization (~> 1.0)
       hydra-pcdm (>= 0.9)
-    hyrax (2.9.6)
-      active-fedora (>= 11.5.2, < 13)
+    hyrax (3.6.0)
+      active-fedora (~> 13.1, >= 13.1.2)
       almond-rails (~> 0.1)
       awesome_nested_set (~> 3.1)
       blacklight (~> 6.14)
       blacklight-gallery (~> 0.7)
       breadcrumbs_on_rails (~> 3.0)
-      browse-everything (>= 0.16)
+      browse-everything (>= 0.16, < 2.0)
       carrierwave (~> 1.0)
       clipboard-rails (~> 1.5)
       draper (~> 4.0)
       dry-equalizer (~> 0.2)
-      dry-struct (>= 0.1, < 2.0)
+      dry-events (~> 0.2.0)
+      dry-monads (< 1.5)
+      dry-struct (~> 1.0)
       dry-transaction (~> 0.11)
-      dry-validation (>= 0.9, < 2.0)
+      dry-validation (~> 1.3)
       flipflop (~> 2.3)
       flot-rails (~> 0.0.6)
       font-awesome-rails (~> 4.2)
       hydra-derivatives (~> 3.3)
-      hydra-editor (>= 3.3, < 6.0)
-      hydra-head (>= 10.6.1, < 12)
-      hydra-works (>= 0.16, < 2.0)
-      iiif_manifest (>= 0.3, < 0.6)
+      hydra-editor (~> 5.0, >= 5.0.4)
+      hydra-file_characterization (~> 1.1.2)
+      hydra-head (~> 11.0, >= 11.0.1)
+      hydra-works (>= 0.16)
+      iiif_manifest (>= 0.3, < 2.0)
       jquery-datatables-rails (~> 3.4)
       jquery-ui-rails (~> 6.0)
+      json-ld (< 3.2)
       json-schema
       kaminari_route_prefix (~> 0.1.1)
       legato (~> 0.3)
-      linkeddata (~> 3.1)
+      linkeddata
       mailboxer (~> 0.12)
       nest (~> 3.1)
       noid-rails (~> 3.0.0)
@@ -458,56 +461,60 @@ GEM
       oauth2 (~> 1.2)
       posix-spawn
       power_converter (~> 0.1, >= 0.1.2)
-      pul_uv_rails (~> 2.0)
-      qa (>= 2.0, < 6.0)
+      psych (~> 3.3)
+      qa (~> 5.5, >= 5.5.1)
       rails (~> 5.0)
       rails_autolink (~> 1.1)
       rdf-rdfxml
-      rdf-vocab (< 3.1.5)
+      rdf-vocab (~> 3.0)
+      redis (~> 4.0)
       redis-namespace (~> 1.5)
-      redlock (>= 0.1.2)
+      redlock (>= 0.1.2, < 2.0)
+      reform (~> 2.3)
+      reform-rails (~> 0.2.0)
       retriable (>= 2.9, < 4.0)
       samvera-nesting_indexer (~> 2.0)
       sass-rails (~> 5.0)
       select2-rails (~> 3.5)
       signet
-      solrizer (>= 3.4, < 5)
-      tinymce-rails (~> 4.1)
-    i18n (1.10.0)
+      tinymce-rails (~> 5.10)
+      valkyrie (~> 2, >= 2.1.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
-    iiif_manifest (0.5.0)
+    iiif_manifest (1.6.0)
       activesupport (>= 4)
-    jbuilder (2.11.5)
+    jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     jquery-datatables-rails (3.4.0)
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
       sass-rails
-    jquery-rails (4.4.0)
+    jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (6.0.1)
       railties (>= 3.2.16)
-    json (2.6.1)
-    json-canonicalization (0.3.0)
-    json-ld (3.2.0)
+    json (2.7.2)
+    json-canonicalization (0.4.0)
+    json-ld (3.1.10)
       htmlentities (~> 4.3)
-      json-canonicalization (~> 0.3)
+      json-canonicalization (~> 0.2)
       link_header (~> 0.0, >= 0.0.8)
-      multi_json (~> 1.15)
-      rack (~> 2.2)
-      rdf (~> 3.2)
+      multi_json (~> 1.14)
+      rack (~> 2.0)
+      rdf (~> 3.1)
     json-ld-preloaded (3.1.6)
       json-ld (~> 3.1)
       rdf (~> 3.1)
-    json-schema (2.8.1)
-      addressable (>= 2.4)
-    jwt (2.3.0)
+    json-schema (5.0.0)
+      addressable (~> 2.8)
+    jwt (2.9.1)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -526,12 +533,12 @@ GEM
       open4 (~> 1.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    ld-patch (3.1.3)
-      ebnf (~> 2.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql (~> 3.1)
-      sxp (~> 1.1)
+    ld-patch (3.2.2)
+      ebnf (~> 2.3)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
     ldp (1.0.3)
       deprecation
       faraday
@@ -542,88 +549,110 @@ GEM
       rdf-turtle
       rdf-vocab (>= 0.8)
       slop
+    ldpath (1.2.0)
+      nokogiri (~> 1.8)
+      parslet
+      rdf (~> 3.0)
+      rdf-vocab (~> 3.0)
     legato (0.7.0)
       multi_json
     libv8 (3.16.14.19)
     link_header (0.0.8)
-    linkeddata (3.1.1)
+    linkeddata (3.1.6)
       equivalent-xml (~> 0.6)
-      json-ld (~> 3.1, >= 3.1.1)
-      json-ld-preloaded (~> 3.1, >= 3.1.1)
-      ld-patch (~> 3.1)
-      nokogiri (~> 1.10)
-      nokogumbo (~> 2.0)
-      rdf (~> 3.1, >= 3.1.1)
+      json-ld (~> 3.1, >= 3.1.10)
+      json-ld-preloaded (~> 3.1, >= 3.1.6)
+      ld-patch (~> 3.1, >= 3.1.3)
+      nokogiri (~> 1.12)
+      rdf (~> 3.1, >= 3.1.15)
       rdf-aggregate-repo (~> 3.1)
-      rdf-isomorphic (~> 3.1)
+      rdf-isomorphic (~> 3.1, >= 3.1.1)
       rdf-json (~> 3.1)
-      rdf-microdata (~> 3.1)
-      rdf-n3 (~> 3.1)
+      rdf-microdata (~> 3.1, >= 3.1.4)
+      rdf-n3 (~> 3.1, >= 3.1.2)
       rdf-normalize (~> 0.4)
-      rdf-rdfa (~> 3.1)
-      rdf-rdfxml (~> 3.1)
-      rdf-reasoner (~> 0.6)
-      rdf-tabular (~> 3.1)
-      rdf-trig (~> 3.1)
-      rdf-trix (~> 3.1)
-      rdf-turtle (~> 3.1)
-      rdf-vocab (~> 3.1, >= 3.1.2)
-      rdf-xsd (~> 3.1)
-      shex (~> 0.6)
-      sparql (~> 3.1)
-      sparql-client (~> 3.1)
+      rdf-ordered-repo (~> 3.1, >= 3.1.1)
+      rdf-rdfa (~> 3.1, >= 3.1.3)
+      rdf-rdfxml (~> 3.1, >= 3.1.1)
+      rdf-reasoner (~> 0.7, >= 0.7.2)
+      rdf-tabular (~> 3.1, >= 3.1.1)
+      rdf-trig (~> 3.1, >= 3.1.2)
+      rdf-trix (~> 3.1, >= 3.1.1)
+      rdf-turtle (~> 3.1, >= 3.1.3)
+      rdf-vocab (~> 3.1, >= 3.1.14)
+      rdf-xsd (~> 3.1, >= 3.1.1)
+      shacl (~> 0.1, >= 0.1.1)
+      shex (~> 0.6, >= 0.6.4)
+      sparql (~> 3.1, >= 3.1.8)
+      sparql-client (~> 3.1, >= 3.1.2)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    logger (1.4.4)
-    loofah (2.18.0)
+    logger (1.6.1)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     mailboxer (0.15.1)
       carrierwave (>= 0.5.8)
       rails (>= 5.0.0)
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
-    memoist (0.16.2)
-    method_source (1.0.0)
-    mime-types (3.4.1)
+    method_source (1.1.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.1115)
+    mime-types-data (3.2024.0903)
     mimemagic (0.3.10)
       nokogiri (~> 1)
       rake
-    mini_magick (4.11.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.4.1)
     mysql2 (0.5.2)
     nest (3.2.0)
       redic
-    net-http-persistent (4.0.1)
+    net-http-persistent (4.0.4)
       connection_pool (~> 2.2)
+    net-imap (0.4.16)
+      date
+      net-protocol
     net-ldap (0.16.1)
-    nio4r (2.5.8)
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
     noid (0.9.0)
     noid-rails (3.0.3)
       actionpack (>= 5.0.0, < 7)
       noid (~> 0.9)
-    nokogiri (1.13.9)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.6)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
-    oauth (0.5.8)
-    oauth2 (1.4.7)
-      faraday (>= 0.8, < 2.0)
+    oauth (1.1.0)
+      oauth-tty (~> 1.0, >= 1.0.1)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)
+    oauth-tty (1.0.5)
+      version_gem (~> 1.1, >= 1.1.1)
+    oauth2 (1.4.11)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
     okcomputer (1.17.4)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
@@ -634,11 +663,11 @@ GEM
     openseadragon (0.6.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
-    os (1.1.1)
+    os (1.1.4)
     parallel (1.22.0)
     parser (3.1.1.0)
       ast (~> 2.4.1)
-    parslet (1.8.2)
+    parslet (2.0.0)
     passenger (6.0.2)
       rack
       rake (>= 0.8.1)
@@ -653,90 +682,100 @@ GEM
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    pul_uv_rails (2.0.1)
+    psych (3.3.4)
+    public_suffix (5.1.1)
     puma (5.6.4)
       nio4r (~> 2.0)
-    qa (2.3.0)
+    qa (5.13.0)
       activerecord-import
       deprecation
-      faraday
+      faraday (< 3.0, != 2.0.0)
+      geocoder
+      ldpath
       nokogiri (~> 1.6)
-      rails (~> 5.0)
+      rails (>= 5.0, < 8.0)
       rdf
-    racc (1.6.0)
-    rack (2.2.3.1)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (5.2.8)
-      actioncable (= 5.2.8)
-      actionmailer (= 5.2.8)
-      actionpack (= 5.2.8)
-      actionview (= 5.2.8)
-      activejob (= 5.2.8)
-      activemodel (= 5.2.8)
-      activerecord (= 5.2.8)
-      activestorage (= 5.2.8)
-      activesupport (= 5.2.8)
+    racc (1.8.1)
+    rack (2.2.9)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rails (5.2.8.1)
+      actioncable (= 5.2.8.1)
+      actionmailer (= 5.2.8.1)
+      actionpack (= 5.2.8.1)
+      actionview (= 5.2.8.1)
+      activejob (= 5.2.8.1)
+      activemodel (= 5.2.8.1)
+      activerecord (= 5.2.8.1)
+      activestorage (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       bundler (>= 1.3.0)
-      railties (= 5.2.8)
+      railties (= 5.2.8.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
       actionview (>= 5.0.1.x)
       activesupport (>= 5.0.1.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
-    rails_autolink (1.1.6)
-      rails (> 3.1)
-    railties (5.2.8)
-      actionpack (= 5.2.8)
-      activesupport (= 5.2.8)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    rails_autolink (1.1.8)
+      actionview (> 3.1)
+      activesupport (> 3.1)
+      railties (> 3.1)
+    railties (5.2.8.1)
+      actionpack (= 5.2.8.1)
+      activesupport (= 5.2.8.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.1.1)
-    rake (13.0.6)
-    rb-fsevent (0.11.0)
-    rb-inotify (0.10.1)
+    rake (13.2.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdf (3.2.6)
+    rdf (3.2.12)
       link_header (~> 0.0, >= 0.0.8)
-    rdf-aggregate-repo (3.1.0)
-      rdf (~> 3.1)
+    rdf-aggregate-repo (3.2.1)
+      rdf (~> 3.2)
     rdf-isomorphic (3.2.1)
       rdf (~> 3.2)
-    rdf-json (3.1.0)
-      rdf (~> 3.1)
-    rdf-microdata (3.1.1)
+    rdf-json (3.2.0)
+      rdf (~> 3.2)
+    rdf-microdata (3.2.1)
       htmlentities (~> 4.3)
-      nokogiri (~> 1.10)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-n3 (3.1.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1, >= 3.1.8)
-      sparql (~> 3.1, >= 3.1.4)
-      sxp (~> 1.1)
-    rdf-normalize (0.4.0)
-      rdf (~> 3.1)
-    rdf-rdfa (3.1.0)
-      haml (~> 5.1)
+      nokogiri (~> 1.13)
+      rdf (~> 3.2)
+      rdf-rdfa (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-n3 (3.2.1)
+      ebnf (~> 2.2)
+      rdf (~> 3.2)
+      sparql (~> 3.2)
+      sxp (~> 1.2)
+    rdf-normalize (0.6.1)
+      rdf (~> 3.2)
+    rdf-ordered-repo (3.2.1)
+      rdf (~> 3.2, >= 3.2.1)
+    rdf-rdfa (3.2.3)
+      haml (>= 5.2, < 7)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-rdfxml (3.1.1)
+      rdf (~> 3.2)
+      rdf-aggregate-repo (~> 3.2)
+      rdf-vocab (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-rdfxml (3.2.2)
+      builder (~> 3.2)
       htmlentities (~> 4.3)
-      rdf (~> 3.1)
-      rdf-rdfa (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-reasoner (0.7.2)
-      rdf (~> 3.1, >= 3.1.12)
-      rdf-xsd (~> 3.1)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-reasoner (0.8.0)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
     rdf-tabular (3.1.1)
       addressable (~> 2.3)
       bcp47 (~> 0.3, >= 0.3.3)
@@ -744,20 +783,20 @@ GEM
       rdf (~> 3.1)
       rdf-vocab (~> 3.1)
       rdf-xsd (~> 3.1)
-    rdf-trig (3.1.2)
-      ebnf (~> 2.1)
-      rdf (~> 3.1)
-      rdf-turtle (~> 3.1)
-    rdf-trix (3.1.1)
-      rdf (~> 3.1)
-      rdf-xsd (~> 3.1)
-    rdf-turtle (3.2.0)
+    rdf-trig (3.2.0)
+      ebnf (~> 2.2)
+      rdf (~> 3.2)
+      rdf-turtle (~> 3.2)
+    rdf-trix (3.2.0)
+      rdf (~> 3.2)
+      rdf-xsd (~> 3.2)
+    rdf-turtle (3.2.1)
       ebnf (~> 2.3)
       rdf (~> 3.2)
-    rdf-vocab (3.1.4)
-      rdf (~> 3.1)
-    rdf-xsd (3.1.1)
-      rdf (~> 3.1)
+    rdf-vocab (3.2.7)
+      rdf (~> 3.2, >= 3.2.4)
+    rdf-xsd (3.2.1)
+      rdf (~> 3.2)
       rexml (~> 3.2)
     react-rails (2.5.0)
       babel-transpiler (>= 0.7.0)
@@ -767,26 +806,33 @@ GEM
       tilt
     redic (1.5.3)
       hiredis
-    redis (4.6.0)
-    redis-namespace (1.8.1)
-      redis (>= 3.0.4)
-    redlock (1.2.2)
-      redis (>= 3.0.0, < 5.0)
+    redis (4.8.1)
+    redis-namespace (1.11.0)
+      redis (>= 4)
+    redlock (1.3.2)
+      redis (>= 3.0.0, < 6.0)
     ref (2.0.0)
+    reform (2.5.0)
+      disposable (>= 0.4.2, < 0.5.0)
+      representable (>= 2.4.0, < 3.1.0)
+      uber (< 0.2.0)
+    reform-rails (0.2.6)
+      activemodel (>= 5.0)
+      reform (>= 2.3.1, < 3.0.0)
     regexp_parser (2.2.1)
-    representable (3.1.1)
+    representable (3.0.4)
       declarative (< 0.1.0)
-      trailblazer-option (>= 0.1.1, < 0.2.0)
+      declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    request_store (1.5.0)
+    request_store (1.7.0)
       rack (>= 1.4)
     responders (3.0.0)
       actionpack (>= 5.0)
       railties (>= 5.0)
     retriable (3.1.2)
-    rexml (3.2.5)
+    rexml (3.3.7)
     rmagick (4.2.6)
-    rsolr (2.5.0)
+    rsolr (2.6.0)
       builder (>= 2.1.2)
       faraday (>= 0.9, < 3, != 2.0.0)
     rspec-core (3.10.1)
@@ -830,7 +876,7 @@ GEM
       json
       multipart-post
       oauth2
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -845,8 +891,8 @@ GEM
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sass-rails (5.0.7)
-      railties (>= 4.0.0, < 6)
+    sass-rails (5.1.0)
+      railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
@@ -859,6 +905,11 @@ GEM
       childprocess (>= 0.5, < 5.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2)
+    shacl (0.1.1)
+      json-ld (~> 3.1, >= 3.1.7)
+      rdf (~> 3.1, >= 3.1.8)
+      sparql (~> 3.1)
+      sxp (~> 1.1)
     shex (0.6.4)
       ebnf (~> 2.1, >= 2.2)
       htmlentities (~> 4.3)
@@ -879,12 +930,12 @@ GEM
     sidekiq-limit_fetch (4.1.0)
       redis (>= 4.6.0)
       sidekiq (>= 4)
-    signet (0.16.0)
+    signet (0.19.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simple_form (5.1.0)
+    simple_form (5.3.1)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     simplecov (0.21.2)
@@ -894,7 +945,10 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
-    slop (4.9.2)
+    slop (4.10.1)
+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)
     solr_wrapper (2.1.0)
       faraday
       retriable
@@ -904,18 +958,18 @@ GEM
       activesupport
       nokogiri
       xml-simple
-    sparql (3.1.8)
-      builder (~> 3.2)
-      ebnf (~> 2.1)
-      logger (~> 1.4)
-      rdf (~> 3.1, >= 3.1.14)
-      rdf-aggregate-repo (~> 3.1)
-      rdf-xsd (~> 3.1)
-      sparql-client (~> 3.1, >= 3.1.2)
-      sxp (~> 1.1)
-    sparql-client (3.1.2)
-      net-http-persistent (~> 4.0, >= 4.0.1)
-      rdf (~> 3.1)
+    sparql (3.2.6)
+      builder (~> 3.2, >= 3.2.4)
+      ebnf (~> 2.3, >= 2.3.5)
+      logger (~> 1.5)
+      rdf (~> 3.2, >= 3.2.11)
+      rdf-aggregate-repo (~> 3.2, >= 3.2.1)
+      rdf-xsd (~> 3.2)
+      sparql-client (~> 3.2, >= 3.2.2)
+      sxp (~> 1.2, >= 1.2.4)
+    sparql-client (3.2.2)
+      net-http-persistent (~> 4.0, >= 4.0.2)
+      rdf (~> 3.2, >= 3.2.11)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -928,23 +982,25 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.1)
-    ssrf_filter (1.0.7)
-    sxp (1.2.2)
-      matrix
+    ssrf_filter (1.0.8)
+    sxp (1.2.4)
+      matrix (~> 0.4)
       rdf (~> 3.2)
-    temple (0.8.2)
+    temple (0.10.3)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.2.1)
+    thor (1.3.2)
     thread_safe (0.3.6)
-    tilt (2.0.10)
+    tilt (2.4.0)
+    timeout (0.4.1)
     tins (1.20.3)
-    tinymce-rails (4.9.11)
+    tinymce-rails (5.10.9)
       railties (>= 3.1.1)
-    trailblazer-option (0.1.1)
     ttfunk (1.6.2.1)
     turbolinks (5.2.0)
       turbolinks-source (~> 5.2)
@@ -953,23 +1009,38 @@ GEM
       actionpack (>= 3.1)
       jquery-rails
       railties (>= 3.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
-    tzinfo (1.2.10)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     uber (0.1.0)
     uglifier (4.1.20)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.8.0)
-    unicode-types (1.7.0)
+    unicode-types (1.10.0)
+    valkyrie (2.2.0)
+      activemodel
+      activesupport
+      disposable (~> 0.4.5)
+      draper
+      dry-struct
+      dry-types (~> 1.0)
+      faraday (< 1.0)
+      json
+      json-ld
+      railties
+      rdf (~> 3.0, >= 3.0.10)
+      rdf-vocab
+      reform (~> 2.2)
+      reform-rails
+    version_gem (1.1.4)
     warden (1.2.8)
       rack (>= 2.0.6)
     webdrivers (4.7.0)
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (> 3.141, < 5.0)
-    webrick (1.7.0)
-    websocket-driver (0.7.5)
+    websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     whenever (1.0.0)
@@ -978,6 +1049,7 @@ GEM
       rexml
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -1007,7 +1079,7 @@ DEPENDENCIES
   ffaker
   handle-system!
   hydra-role-management
-  hyrax (~> 2.9)
+  hyrax (= 3.6.0)
   jbuilder (~> 2.5)
   jquery-rails
   ladle
@@ -1040,6 +1112,7 @@ DEPENDENCIES
   simplecov
   simplecov-lcov (~> 0.8.0)
   solr_wrapper (>= 0.3)
+  sprockets (= 3.7.2)
   sqlite3
   term-ansicolor
   therubyracer
@@ -1050,7 +1123,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 2.7.7p221
 
 BUNDLED WITH
    2.2.32
diff --git a/Rakefile b/Rakefile
index d3e529df..c95e40c1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -571,7 +571,7 @@ task put_objects_in_workflow: :environment do
     tries = 20
     begin
       object = object.reload
-      sipity_workflow_action = PowerConverter.convert_to_sipity_action("publish", scope: subject.entity.workflow) { nil }
+      sipity_workflow_action = Sipity::WorkflowAction("publish", subject.entity.workflow) { nil }
       Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: "Migrated from Fedora 3")
     rescue NoMethodError
       tries -= 1
diff --git a/app/controllers/catalog_controller.rb b/app/controllers/catalog_controller.rb
index 7238aab9..bac6f472 100644
--- a/app/controllers/catalog_controller.rb
+++ b/app/controllers/catalog_controller.rb
@@ -30,7 +30,7 @@ def self.modified_field
     config.show.partials.insert(1, :openseadragon)
 
     config.search_builder_class = TuftsCatalogSearchBuilder
-    #     config.search_builder_class = Hyrax::CatalogSearchBuilder
+    #     config.search_builder_class =  Blacklight::SearchBuilder
     # Show gallery view
     config.view.gallery.partials = [:index_header, :index]
     config.view.slideshow.partials = [:index]
diff --git a/app/controllers/hyrax/admin/workflows_controller.rb b/app/controllers/hyrax/admin/workflows_controller.rb
deleted file mode 100644
index 5b543100..00000000
--- a/app/controllers/hyrax/admin/workflows_controller.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  # Presents a list of works in workflow
-  class Admin::WorkflowsController < ApplicationController
-    before_action :ensure_authorized!
-    with_themed_layout 'dashboard'
-    class_attribute :deposited_workflow_state_name
-
-    # Works that are in this workflow state (see workflow json template) are excluded from the
-    # status list and display in the "Published" tab
-    self.deposited_workflow_state_name = 'deposited'
-
-    def index
-      add_breadcrumb t(:'hyrax.controls.home'), root_path
-      add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-      add_breadcrumb t(:'hyrax.admin.sidebar.tasks'), '#'
-      add_breadcrumb t(:'hyrax.admin.sidebar.workflow_review'), request.path
-      @status_list = Hyrax::Workflow::StatusListService.new(self, "-workflow_state_name_ssim:#{deposited_workflow_state_name} AND createdby_tesim:#{Contribution::SELFDEP}")
-      @published_list = Hyrax::Workflow::StatusListService.new(self, "workflow_state_name_ssim:#{deposited_workflow_state_name} AND createdby_tesim:#{Contribution::SELFDEP}")
-    end
-
-    private
-
-    def ensure_authorized!
-      authorize! :review, :submissions
-    end
-  end
-end
diff --git a/app/controllers/hyrax/my/collections_controller.rb b/app/controllers/hyrax/my/collections_controller.rb
deleted file mode 100644
index b483d112..00000000
--- a/app/controllers/hyrax/my/collections_controller.rb
+++ /dev/null
@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  module My
-    class CollectionsController < MyController
-      # Define collection specific filter facets.
-      def self.configure_facets
-        configure_blacklight do |config|
-          # Name of pivot facet must match field name that uses helper_method
-          config.add_facet_field Collection.collection_type_gid_document_field_name,
-                                 helper_method: :collection_type_label, limit: 5,
-                                 pivot: ['has_model_ssim', Collection.collection_type_gid_document_field_name],
-                                 label: 'Collection Type'
-          # This causes AdminSets to also be shown with the Collection Type label
-          config.add_facet_field 'has_model_ssim',
-                                 label: 'Collection Type',
-                                 limit: 5, show: false
-        end
-      end
-      configure_facets
-
-      def search_builder_class
-        Hyrax::My::CollectionsSearchBuilder
-      end
-
-      def index
-        add_breadcrumb t(:'hyrax.controls.home'), root_path
-        add_breadcrumb t(:'hyrax.dashboard.breadcrumbs.admin'), hyrax.dashboard_path
-        add_breadcrumb t(:'hyrax.admin.sidebar.collections'), hyrax.my_collections_path
-        collection_type_list_presenter
-        managed_collections_count
-        super
-      end
-
-      private
-
-      def search_action_url(*args)
-        hyrax.my_collections_url(*args)
-      end
-
-      # The url of the "more" link for additional facet values
-      def search_facet_path(args = {})
-        hyrax.my_dashboard_collections_facet_path(args[:id])
-      end
-
-      def collection_type_list_presenter
-        @collection_type_list_presenter ||= Hyrax::SelectCollectionTypeListPresenter.new(current_user)
-      end
-
-      def managed_collections_count
-        @managed_collection_count = Hyrax::Collections::ManagedCollectionsService.managed_collections_count(scope: self)
-      end
-    end
-  end
-end
diff --git a/app/controllers/hyrax/my/works_controller.rb b/app/controllers/hyrax/my/works_controller.rb
index ac97ada9..c2fb1c09 100644
--- a/app/controllers/hyrax/my/works_controller.rb
+++ b/app/controllers/hyrax/my/works_controller.rb
@@ -5,8 +5,10 @@ class WorksController < MyController
       # Define collection specific filter facets.
       def self.configure_facets
         configure_blacklight do |config|
-          config.add_facet_field solr_name("admin_set", :facetable), limit: 5
-          config.add_facet_field solr_name('member_of_collections', :symbol), limit: 5
+          # We changed the search builder class
+          config.search_builder_class = TuftsMyWorksSearchBuilder
+          config.add_facet_field "admin_set_sim", limit: 5
+          config.add_facet_field "member_of_collections_ssim", limit: 5
         end
       end
       configure_facets
@@ -14,12 +16,7 @@ def self.configure_facets
       class_attribute :create_work_presenter_class
       self.create_work_presenter_class = Hyrax::SelectTypeListPresenter
 
-      # Search builder for a list of works that belong to me
-      # Override of Blacklight::RequestBuilders
-      def search_builder_class
-        TuftsMyWorksSearchBuilder
-      end
-
+      # We added this function
       def suppressed_to_status(value)
         case value
         when "false"
@@ -41,6 +38,7 @@ def index
         super
       end
 
+      # We added this function
       def create
         super
       end
diff --git a/app/controllers/hyrax/my_controller.rb b/app/controllers/hyrax/my_controller.rb
deleted file mode 100644
index 1f71533b..00000000
--- a/app/controllers/hyrax/my_controller.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  class MyController < ApplicationController
-    include Hydra::Catalog
-    include Hyrax::Collections::AcceptsBatches
-
-    # Define filter facets that apply to all repository objects.
-    def self.configure_facets
-      # clear facet's copied from the CatalogController
-      blacklight_config.facet_fields = {}
-      configure_blacklight do |config|
-        # TODO: add a visibility facet (requires visibility to be indexed)
-        config.add_facet_field solr_name('visibility', :stored_sortable),
-                               helper_method: :visibility_badge,
-                               limit: 5, label: 'Visibility'
-        config.add_facet_field IndexesWorkflow.suppressed_field, helper_method: :suppressed_to_status
-        config.add_facet_field solr_name("resource_type", :facetable), limit: 5
-      end
-    end
-
-    with_themed_layout 'dashboard'
-
-    include Blacklight::Configurable
-
-    copy_blacklight_config_from(CatalogController)
-    configure_facets
-
-    before_action :authenticate_user!
-    load_and_authorize_resource only: :show, instance_name: :collection
-
-    # include the render_check_all view helper method
-    helper Hyrax::BatchEditsHelper
-    # include the display_trophy_link view helper method
-    helper Hyrax::TrophyHelper
-
-    def index
-      @user = current_user
-      (@response, @document_list) = query_solr
-      prepare_instance_variables_for_batch_control_display
-
-      respond_to do |format|
-        format.html {}
-        format.rss  { render layout: false }
-        format.atom { render layout: false }
-      end
-    end
-
-    private
-
-    # TODO: Extract a presenter object that wrangles all of these instance variables.
-    def prepare_instance_variables_for_batch_control_display
-      # set up some parameters for allowing the batch controls to show appropriately
-      max_batch_size = 80
-      count_on_page = @document_list.count { |doc| batch.index(doc.id) }
-      @disable_select_all = @document_list.count > max_batch_size
-      @result_set_size = @response.response["numFound"]
-      @empty_batch = batch.empty?
-      @all_checked = (count_on_page == @document_list.count)
-      @add_works_to_collection = params.fetch(:add_works_to_collection, '')
-      @add_works_to_collection_label = params.fetch(:add_works_to_collection_label, '')
-    end
-
-    def query_solr
-      search_results(params)
-    end
-  end
-end
diff --git a/app/indexers/hyrax/repository_reindexer.rb b/app/indexers/hyrax/repository_reindexer.rb
index 44d8186c..e0082192 100644
--- a/app/indexers/hyrax/repository_reindexer.rb
+++ b/app/indexers/hyrax/repository_reindexer.rb
@@ -10,7 +10,7 @@ module ClassMethods
       # overrides https://github.com/samvera/active_fedora/blob/master/lib/active_fedora/indexing.rb#L95-L125
       # see implementation details in adapters/nesting_index_adapter.rb#each_perservation_document_id_and_parent_ids
       def reindex_everything(*)
-        # Samvera::NestingIndexer.reindex_all!(extent: Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX)
+        # We replaced Hyrax::Adapters::NestingIndexAdapter::FULL_REINDEX with Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
         Samvera::NestingIndexer.reindex_all!(extent: Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX)
       end
     end
diff --git a/app/lib/tufts/workflow_setup.rb b/app/lib/tufts/workflow_setup.rb
index 2318a847..903e166a 100644
--- a/app/lib/tufts/workflow_setup.rb
+++ b/app/lib/tufts/workflow_setup.rb
@@ -8,6 +8,7 @@ def self.setup
     end
 
     def setup
+      # temp remove this
       set_default_workflow
       grant_publish_role_to_admins
     end
@@ -17,7 +18,8 @@ def set_default_workflow
       # associated PermissionTemplate exist, even if the database has been reset
       # Cribbed from hyrax/lib/tasks/default_admin_set.rake
       begin
-        AdminSet.find_or_create_default_admin_set_id
+        ::Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
+        # id = Hyrax::AdminSetCreateService.find_or_create_default_admin_set.id
       rescue ActiveRecord::RecordNotUnique
         Rails.logger.debug "Tried to make default permission template but it already exists"
       end
diff --git a/app/lib/tufts/workflow_status.rb b/app/lib/tufts/workflow_status.rb
index 00c13406..bba56dea 100644
--- a/app/lib/tufts/workflow_status.rb
+++ b/app/lib/tufts/workflow_status.rb
@@ -26,7 +26,7 @@ def self.draft_exist?(id)
     # publish a work, and kick off a handle registration job if appropriate
     def self.publish(work:, current_user:, comment:)
       subject = Hyrax::WorkflowActionInfo.new(work, current_user)
-      sipity_workflow_action = PowerConverter.convert_to_sipity_action("publish", scope: subject.entity.workflow) { nil }
+      sipity_workflow_action = Sipity::WorkflowAction("publish", subject.entity.workflow) { nil }
       Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: comment)
       Hyrax::Actors::HandleAssuranceActor.ensure_handle(object: work)
     end
@@ -36,7 +36,7 @@ def self.publish(work:, current_user:, comment:)
     # and kick off a handle registration job if appropriate
     def self.batch_publish(work:, current_user:, comment:)
       subject = Hyrax::WorkflowActionInfo.new(work, current_user)
-      sipity_workflow_action = PowerConverter.convert_to_sipity_action("batch_publish", scope: subject.entity.workflow) { nil }
+      sipity_workflow_action = Sipity::WorkflowAction("batch_publish", subject.entity.workflow) { nil }
       Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: comment)
       Hyrax::Actors::HandleAssuranceActor.ensure_handle(object: work)
     end
@@ -45,7 +45,7 @@ def self.batch_publish(work:, current_user:, comment:)
     # unpublish a work
     def self.unpublish(work:, current_user:, comment:)
       subject = Hyrax::WorkflowActionInfo.new(work, current_user)
-      sipity_workflow_action = PowerConverter.convert_to_sipity_action("unpublish", scope: subject.entity.workflow) { nil }
+      sipity_workflow_action = Sipity::WorkflowAction("unpublish", subject.entity.workflow) { nil }
       Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: comment)
     end
 
@@ -53,7 +53,7 @@ def self.unpublish(work:, current_user:, comment:)
     # unpublish a work
     def self.batch_unpublish(work:, current_user:, comment:)
       subject = Hyrax::WorkflowActionInfo.new(work, current_user)
-      sipity_workflow_action = PowerConverter.convert_to_sipity_action("batch_unpublish", scope: subject.entity.workflow) { nil }
+      sipity_workflow_action = Sipity::WorkflowAction("batch_unpublish", subject.entity.workflow) { nil }
       Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: comment)
     end
 
diff --git a/app/models/catalog_search_builder.rb b/app/models/catalog_search_builder.rb
index 5a216dcc..edf62e5f 100644
--- a/app/models/catalog_search_builder.rb
+++ b/app/models/catalog_search_builder.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
-class Hyrax::CatalogSearchBuilder < Hyrax::SearchBuilder
+class Hyrax::CatalogSearchBuilder < Blacklight::SearchBuilder
+  include Hydra::AccessControlsEnforcement
+  include Hyrax::SearchFilters
+
   self.default_processor_chain += [
     :add_access_controls_to_solr_params,
     :show_works_or_works_that_contain_files,
diff --git a/app/models/concerns/hyrax/ability.rb b/app/models/concerns/hyrax/ability.rb
index 47991406..7393f336 100644
--- a/app/models/concerns/hyrax/ability.rb
+++ b/app/models/concerns/hyrax/ability.rb
@@ -75,7 +75,7 @@ def admin_set_with_deposit?
                                       .joins(:permission_template)
                                       .pluck(Arel.sql('DISTINCT source_id'))
         query = "_query_:\"{!raw f=has_model_ssim}AdminSet\" AND {!terms f=id}#{ids.join(',')}"
-        ActiveFedora::SolrService.count(query, method: :post).positive?
+        Hyrax::SolrService.count(query, method: :post).positive?
       end
 
       # This overrides hydra-head, (and restores the method from blacklight-access-controls)
diff --git a/app/models/concerns/hyrax/collection_nesting.rb b/app/models/concerns/hyrax/collection_nesting.rb
index 9fcc229f..0a042e33 100644
--- a/app/models/concerns/hyrax/collection_nesting.rb
+++ b/app/models/concerns/hyrax/collection_nesting.rb
@@ -61,7 +61,7 @@ def update_index(*args)
     end
 
     def find_children_of(destroyed_id:)
-      ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(member_of_collection_ids_ssim: destroyed_id), rows: 500_000)
+      Hyrax::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(member_of_collection_ids_ssim: destroyed_id), rows: 500_000)
     end
 
     # Only models which include Hyrax::CollectionNesting will respond to this method.
diff --git a/app/models/concerns/hyrax/file_set/characterization.rb b/app/models/concerns/hyrax/file_set/characterization.rb
index 6db6211d..ce8fbc5c 100644
--- a/app/models/concerns/hyrax/file_set/characterization.rb
+++ b/app/models/concerns/hyrax/file_set/characterization.rb
@@ -1,30 +1,37 @@
 # frozen_string_literal: true
-# This module points the FileSet to the location of the technical metdata.
-# By default, the file holding the metadata is :original_file and the terms
-# are listed under ::characterization_terms.
-# Implementations may define their own terms or use a different source file, but
-# any terms must be set on the ::characterization_proxy by the Hydra::Works::CharacterizationService
-#
-# class MyFileSet
-#   include Hyrax::FileSetBehavior
-# end
-#
-# MyFileSet.characterization_proxy = :master_file
-# MyFileSet.characterization_terms = [:term1, :term2, :term3]
+
 module Hyrax
-  module FileSet
+  class FileSet
+    ##
+    # This module points the FileSet to the location of the technical metadata.
+    # By default, the file holding the metadata is +:original_file+ and the terms
+    # are listed under +.characterization_terms+.
+    #
+    # Implementations may define their own terms or use a different source file, but
+    # any terms must be set on the +.characterization_proxy+ by the
+    # +Hydra::Works::CharacterizationService+.
+    #
+    # @example
+    #   class MyFileSet
+    #     include Hyrax::FileSetBehavior
+    #   end
+    #
+    #   MyFileSet.characterization_proxy = :master_file
+    #   MyFileSet.characterization_terms = [:term1, :term2, :term3]
+    #
     module Characterization
       extend ActiveSupport::Concern
 
       included do
         class_attribute :characterization_terms, :characterization_proxy
+        # we added terms from :bits_per_sample to :file_date_created
         self.characterization_terms = [
           :format_label, :file_size, :height, :width, :filename, :well_formed,
           :page_count, :file_title, :last_modified, :original_checksum,
-          :duration, :sample_rate, :bits_per_sample, :resolution_unit,
+          :duration, :sample_rate, :alpha_channels, :bits_per_sample, :resolution_unit,
           :samples_per_pixel, :y_resolution, :x_resolution, :file_date_created
         ]
-        self.characterization_proxy = :original_file
+        self.characterization_proxy = Hyrax.config.characterization_proxy
 
         delegate(*characterization_terms, to: :characterization_proxy)
 
@@ -36,6 +43,7 @@ def characterization_proxy?
           !characterization_proxy.is_a?(NullCharacterizationProxy)
         end
 
+        # we added this function
         def file_date_created
           @date_created ||= characterization_proxy.date_created
         end
@@ -56,6 +64,19 @@ def respond_to_missing?(_method_name, _include_private = false)
 
         def mime_type; end
       end
+
+      # Add Alpha Channels to the Schema
+      class AlphaChannelsSchema < ActiveTriples::Schema
+        property :alpha_channels, predicate: ::RDF::URI.new('http://vocabulary.samvera.org/ns#alphaChannels')
+      end
+
+      ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << AlphaChannelsSchema
+
+      # Add file_set_id for Valkyrie support.
+      class FileSetIdSchema < ActiveTriples::Schema
+        property :file_set_id, predicate: ::RDF::URI.new('http://vocabulary.samvera.org/ns#fileSetId')
+      end
+      ActiveFedora::WithMetadata::DefaultMetadataClassFactory.file_metadata_schemas << FileSetIdSchema
     end
   end
 end
diff --git a/app/presenters/hyrax/characterization_behavior.rb b/app/presenters/hyrax/characterization_behavior.rb
index 5d8c1c58..a180168e 100644
--- a/app/presenters/hyrax/characterization_behavior.rb
+++ b/app/presenters/hyrax/characterization_behavior.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# TODO: review and update this override
 module Hyrax
   module CharacterizationBehavior
     extend ActiveSupport::Concern
diff --git a/app/presenters/hyrax/tufts_collection_presenter.rb b/app/presenters/hyrax/tufts_collection_presenter.rb
index dcb88d8b..5454e200 100644
--- a/app/presenters/hyrax/tufts_collection_presenter.rb
+++ b/app/presenters/hyrax/tufts_collection_presenter.rb
@@ -18,7 +18,7 @@ def nested_collection_names_and_links
         parsed_ids.delete(id)
         enhanced_id_list = []
         parsed_ids.each do |p_id|
-          results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(id: p_id), rows: 1, fl: 'title_tesim')
+          results = Hyrax::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(id: p_id), rows: 1, fl: 'title_tesim')
           title_tesim = results[0]['title_tesim']
           enhanced_id_list.push(id: p_id, title: title_tesim[0])
         end
diff --git a/app/search_builders/hyrax/admin_admin_set_member_search_builder.rb b/app/search_builders/hyrax/admin_admin_set_member_search_builder.rb
deleted file mode 100644
index 56a1c077..00000000
--- a/app/search_builders/hyrax/admin_admin_set_member_search_builder.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  # Builds a query to find the members of an admin set.
-  # For use on the admin menu, so it includes works regardless of status.
-  class AdminAdminSetMemberSearchBuilder < ::SearchBuilder
-    self.default_processor_chain += [:in_admin_set]
-    self.default_processor_chain -= [:only_active_works]
-
-    attr_reader :collection
-
-    # @param [scope] Typically the controller object
-    # @param [Collection]
-    def initialize(scope:, collection:)
-      @collection = collection
-      super(scope)
-    end
-
-    # include filters into the query to only include the admin_set members (regardless of status)
-    def in_admin_set(solr_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << "{!term f=isPartOf_ssim}#{collection.id}"
-    end
-  end
-end
diff --git a/app/search_builders/hyrax/collection_member_search_builder.rb b/app/search_builders/hyrax/collection_member_search_builder.rb
deleted file mode 100644
index 81c21e3e..00000000
--- a/app/search_builders/hyrax/collection_member_search_builder.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  # This search builder requires that a accessor named "collection" exists in the scope
-  class CollectionMemberSearchBuilder < ::SearchBuilder
-    include Hyrax::FilterByType
-    attr_reader :collection, :search_includes_models
-
-    class_attribute :collection_membership_field
-    self.collection_membership_field = 'member_of_collection_ids_ssim'
-
-    # Defines which search_params_logic should be used when searching for Collection members
-    self.default_processor_chain += [:member_of_collection]
-
-    # @param [scope] Typically the controller object
-    # @param [Symbol] :works, :collections, (anything else retrieves both)
-    def initialize(scope:,
-                   collection:,
-                   search_includes_models: :works)
-      @collection = collection
-      @search_includes_models = search_includes_models
-      super(scope)
-    end
-
-    # include filters into the query to only include the collection memebers
-    def member_of_collection(solr_parameters)
-      solr_parameters[:fq] ||= []
-      solr_parameters[:fq] << "#{collection_membership_field}:#{collection.id}"
-    end
-
-    # This overrides the models in FilterByType
-    def models
-      case search_includes_models
-      when :collections
-        collection_classes
-      when :works
-        work_classes
-      else super # super includes both works and collections
-      end
-    end
-  end
-end
diff --git a/app/search_builders/tufts_catalog_search_builder.rb b/app/search_builders/tufts_catalog_search_builder.rb
index 3da09c5d..8dddaec9 100644
--- a/app/search_builders/tufts_catalog_search_builder.rb
+++ b/app/search_builders/tufts_catalog_search_builder.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class TuftsCatalogSearchBuilder < Hyrax::CatalogSearchBuilder
+class TuftsCatalogSearchBuilder < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior
   include BlacklightAdvancedSearch::AdvancedSearchBuilder
   self.default_processor_chain += [:add_advanced_parse_q_to_solr, :add_advanced_search_to_solr, :show_works_or_works_that_contain_files]
diff --git a/app/services/hyrax/admin_set_service.rb b/app/services/hyrax/admin_set_service.rb
index ec99fd93..b9bc6fa5 100644
--- a/app/services/hyrax/admin_set_service.rb
+++ b/app/services/hyrax/admin_set_service.rb
@@ -5,6 +5,7 @@
 # Hyrax.config.admin_set_predicate, and we have opened a ticket in Hyrax to
 # address that (See https://github.com/samvera/hyrax/issues/2405). In the meantime,
 # we have to hard-code the new value.
+# TODO: review this more, the overrides the community says they resolved the issue but count_files does not seem to be changed
 module Hyrax
   # Returns AdminSets that the current user has permission to use.
   class AdminSetService
@@ -35,8 +36,8 @@ def search_results_with_work_count(access, join_field: "admin_set_member_ssim")
       admin_sets = search_results(access)
       ids = admin_sets.map(&:id).join(',')
       query = "{!terms f=#{join_field}}#{ids}"
-      results = ActiveFedora::SolrService.instance.conn.get(
-        ActiveFedora::SolrService.select_path,
+      results = Hyrax::SolrService.instance.conn.get(
+        Hyrax::SolrService.select_path,
         params: { fq: query,
                   'facet.field' => join_field }
       )
diff --git a/app/services/hyrax/collection_types/permissions_service.rb b/app/services/hyrax/collection_types/permissions_service.rb
deleted file mode 100644
index 90a0af0d..00000000
--- a/app/services/hyrax/collection_types/permissions_service.rb
+++ /dev/null
@@ -1,239 +0,0 @@
-# frozen_string_literal: true
-# Patching to add Arel to various pluck calls, solving:
-#    Dangerous query method (method whose arguments are used as raw SQL) called with non-attribute argument(s)
-# This can be removed when updating to Hyrax 3, as it is resolved in the source there.
-# Lines 198, 213
-
-module Hyrax
-  module CollectionTypes
-    class PermissionsService
-      # @api public
-      #
-      # Ids of collection types that a user can create or manage
-      #
-      # @param roles [String] type of access, Hyrax::CollectionTypeParticipant::MANAGE_ACCESS and/or Hyrax::CollectionTypeParticipant::CREATE_ACCESS
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Array<String>] ids for collection types for which a user has the specified role
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.collection_type_ids_for_user(roles:, user: nil, ability: nil)
-        return false unless user.present? || ability.present?
-        return Hyrax::CollectionType.all.pluck(Arel.sql('DISTINCT id')) if user_admin?(user, ability)
-        Hyrax::CollectionTypeParticipant.where(agent_type: Hyrax::CollectionTypeParticipant::USER_TYPE,
-                                               agent_id: user_id(user, ability),
-                                               access: roles)
-                                        .or(
-                                          Hyrax::CollectionTypeParticipant.where(agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
-                                                                                 agent_id: user_groups(user, ability),
-                                                                                 access: roles)
-                                        ).pluck(Arel.sql('DISTINCT hyrax_collection_type_id'))
-      end
-
-      # @api public
-      #
-      # Instances of collection types that a user can create or manage
-      #
-      # @param roles [String] type of access, Hyrax::CollectionTypeParticipant::MANAGE_ACCESS and/or Hyrax::CollectionTypeParticipant::CREATE_ACCESS
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Array<Hyrax::CollectionType>] instances of collection types for which a user has the specified role
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.collection_types_for_user(roles:, user: nil, ability: nil)
-        return false unless user.present? || ability.present?
-        return Hyrax::CollectionType.all if user_admin?(user, ability)
-        Hyrax::CollectionType.where(id: collection_type_ids_for_user(user: user, roles: roles, ability: ability))
-      end
-
-      # @api public
-      #
-      # Is the user a creator for any collection types?
-      #
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Boolean] true if the user has permission to create collections of at least one collection type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.can_create_any_collection_type?(user: nil, ability: nil)
-        return false unless user.present? || ability.present?
-        return true if user_admin?(user, ability)
-        # both manage and create access can create collections of a type, so no need to include access in the query
-        return true if Hyrax::CollectionTypeParticipant.where(agent_type: Hyrax::CollectionTypeParticipant::USER_TYPE,
-                                                              agent_id: user_id(user, ability)).any?
-        return true if Hyrax::CollectionTypeParticipant.where(agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
-                                                              agent_id: user_groups(user, ability)).any?
-        false
-      end
-
-      # @api public
-      #
-      # Is the user a creator for admin sets collection types?
-      #
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Boolean] true if the user has permission to create collections of type admin_set
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.can_create_admin_set_collection_type?(user: nil, ability: nil)
-        return false unless user.present? || ability.present?
-        return true if user_admin?(user, ability)
-        # both manage and create access can create collections of a type, so no need to include access in the query
-        return true if Hyrax::CollectionTypeParticipant.joins(:hyrax_collection_type)
-                                                       .where(agent_type: Hyrax::CollectionTypeParticipant::USER_TYPE,
-                                                              agent_id: user_id(user, ability),
-                                                              hyrax_collection_types: { machine_id: Hyrax::CollectionType::ADMIN_SET_MACHINE_ID }).present?
-        return true if Hyrax::CollectionTypeParticipant.joins(:hyrax_collection_type)
-                                                       .where(agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
-                                                              agent_id: user_groups(user, ability),
-                                                              hyrax_collection_types: { machine_id: Hyrax::CollectionType::ADMIN_SET_MACHINE_ID }).present?
-        false
-      end
-
-      # @api public
-      #
-      # Get a list of collection types that a user can create
-      #
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Array<Hyrax::CollectionType>] array of collection types the user can create
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.can_create_collection_types(user: nil, ability: nil)
-        collection_types_for_user(user: user, ability: ability, roles: [Hyrax::CollectionTypeParticipant::MANAGE_ACCESS, Hyrax::CollectionTypeParticipant::CREATE_ACCESS])
-      end
-
-      # @api public
-      #
-      # Get a list of collection types that a user can create
-      #
-      # @param collection_type [Hyrax::CollectionType] the type of the collection being created
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Boolean] true if the user has permission to create collections of specified type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.can_create_collection_of_type?(collection_type:, user: nil, ability: nil)
-        manage_access_for_collection_type?(user: user, ability: ability, collection_type: collection_type) ||
-          create_access_for_collection_type?(user: user, ability: ability, collection_type: collection_type)
-      end
-
-      # @api private
-      #
-      # Determine if the given user has :manage access for the given collection type
-      #
-      # @param collection_type [Hyrax::CollectionType] the collection type we are checking permissions on
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Boolean] true if the user has permission to manage collections of the specified collection type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.manage_access_for_collection_type?(collection_type:, user: nil, ability: nil)
-        access_to_collection_type?(user: user, ability: ability, collection_type: collection_type, access: 'manage')
-      end
-      private_class_method :manage_access_for_collection_type?
-
-      # @api private
-      #
-      # Determine if the given user has :create access for the given collection type
-      #
-      # @param collection_type [Hyrax::CollectionType] the collection type we are checking permissions on
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Boolean] true if the user has permission to create collections of the specified collection type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.create_access_for_collection_type?(collection_type:, user: nil, ability: nil)
-        access_to_collection_type?(user: user, ability: ability, collection_type: collection_type, access: 'create')
-      end
-      private_class_method :create_access_for_collection_type?
-
-      # @api private
-      #
-      # Determine if the given user has specified access for the given collection type
-      #
-      # @param collection_type [Hyrax::CollectionType] the collection type we are checking permissions on
-      # @param access [Symbol] the access level to check
-      # @param user [User] user (required if ability is nil)
-      # @param ability [Ability] the ability coming from cancan ability check (default: nil) (required if user is nil)
-      # @return [Boolean] true if the user has permission to create collections of the specified collection type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.access_to_collection_type?(collection_type:, access:, user: nil, ability: nil) # rubocop:disable Metrics/CyclomaticComplexity
-        return false unless user.present? || ability.present?
-        return false unless user && collection_type
-        return true if ([user_id(user, ability)] & agent_ids_for(collection_type: collection_type, agent_type: 'user', access: access)).present?
-        return true if (user_groups(user, ability) & agent_ids_for(collection_type: collection_type, agent_type: 'group', access: access)).present?
-        false
-      end
-      private_class_method :access_to_collection_type?
-
-      # @api public
-      #
-      # What types of collection can the user create or manage
-      #
-      # @param user [User] user - The user requesting to create/manage a Collection
-      # @param roles [String] type of access, Hyrax::CollectionTypeParticipant::MANAGE_ACCESS and/or Hyrax::CollectionTypeParticipant::CREATE_ACCESS
-      # @return [Array<Hyrax::CollectionType>]
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.agent_ids_for(collection_type:, agent_type:, access:)
-        Hyrax::CollectionTypeParticipant.where(hyrax_collection_type_id: collection_type.id,
-                                               agent_type: agent_type,
-                                               access: access).pluck(Arel.sql('DISTINCT agent_id'))
-      end
-      private_class_method :agent_ids_for
-
-      # @api public
-      #
-      # Get a list of users who should be added as user editors for a new collection of the specified collection type
-      #
-      # @param collection_type [Hyrax::CollectionType] the type of the collection being created
-      # @return [Array<String>] array of user identifiers (typically emails) for users who can edit collections of this type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.user_edit_grants_for_collection_of_type(collection_type: nil)
-        return [] unless collection_type
-        Hyrax::CollectionTypeParticipant.joins(:hyrax_collection_type).where(hyrax_collection_type_id: collection_type.id,
-                                                                             agent_type: Hyrax::CollectionTypeParticipant::USER_TYPE,
-                                                                             access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS).pluck(Arel.sql('DISTINCT agent_id'))
-      end
-
-      # @api public
-      #
-      # Get a list of group that should be added as group editors for a new collection of the specified collection type
-      #
-      # @param collection_type [Hyrax::CollectionType] the type of the collection being created
-      # @return [Array<String>] array of group identifiers (typically groupname) for groups who can edit collections of this type
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      #   If calling from Abilities, pass the ability.  If you try to get the ability from the user, you end up in an infinit loop.
-      def self.group_edit_grants_for_collection_of_type(collection_type: nil)
-        return [] unless collection_type
-        groups = Hyrax::CollectionTypeParticipant.joins(:hyrax_collection_type).where(hyrax_collection_type_id: collection_type.id,
-                                                                                      agent_type: Hyrax::CollectionTypeParticipant::GROUP_TYPE,
-                                                                                      access: Hyrax::CollectionTypeParticipant::MANAGE_ACCESS).pluck(Arel.sql('DISTINCT agent_id'))
-        groups | ['admin']
-      end
-
-      def self.user_groups(user, ability)
-        # if called from abilities class, use ability instead of user; otherwise, you end up in an infinite loop
-        return ability.user_groups if ability.present?
-        user.ability.user_groups
-      end
-      private_class_method :user_groups
-
-      def self.user_admin?(user, ability)
-        # if called from abilities class, use ability instead of user; otherwise, you end up in an infinite loop
-        return ability.admin? if ability.present?
-        user.ability.admin?
-      end
-      private_class_method :user_groups
-
-      def self.user_id(user, ability)
-        return ability.current_user.user_key if ability.present?
-        user.user_key
-      end
-      private_class_method :user_id
-    end
-  end
-end
diff --git a/app/services/hyrax/collections/migration_service.rb b/app/services/hyrax/collections/migration_service.rb
index 3b4fde2f..4af07580 100644
--- a/app/services/hyrax/collections/migration_service.rb
+++ b/app/services/hyrax/collections/migration_service.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Hyrax
   module Collections
+    ##
+    # @deprecated this migration tool should no longer be useful after Hyrax 2.1.0; Removal is planned for 4.0
     # Responsible for migrating legacy collections.  Legacy collections are those created before Hyrax 2.1.0 and
     # are identified by the lack of the collection having a collection type gid.
     class MigrationService
@@ -9,7 +11,9 @@ class MigrationService
       # Migrate all legacy collections to extended collections with collection type assigned.  Legacy collections are those
       # created before Hyrax 2.1.0 and are identified by the lack of the collection having a collection type gid.
       def self.migrate_all_collections
-        Rails.logger.info "*** Migrating #{::Collection.count} collections with limited reindexing"
+        Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
+
+        Rails.logger.info "*** Migrating #{::Collection.count} collections"
         ::Collection.all.each do |col|
           col.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
           migrate_collection(col)
@@ -31,13 +35,14 @@ def self.migrate_all_collections
       # @param collection [::Collection] collection object to be migrated
       def self.migrate_collection(collection)
         return if collection.collection_type_gid.present? # already migrated
-        collection.collection_type_gid = Hyrax::CollectionType.find_or_create_default_collection_type.gid
+        collection.collection_type_gid = Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id
         create_permissions(collection)
         collection.reindex_extent = Hyrax::Adapters::NestingIndexAdapter::LIMITED_REINDEX
         collection.save
       end
       private_class_method :migrate_collection
 
+      ##
       # @api private
       #
       # Migrate a single adminset to grant depositors and viewers read access to the admin set unless the grant is for
@@ -48,7 +53,8 @@ def self.migrate_collection(collection)
       def self.migrate_adminset(adminset)
         Hyrax::PermissionTemplateAccess.find_or_create_by(permission_template_id: adminset.permission_template.id,
                                                           agent_type: "group", agent_id: "admin", access: "manage")
-        adminset.reset_access_controls!
+
+        adminset.permission_template.reset_access_controls_for(collection: adminset)
       end
       private_class_method :migrate_adminset
 
@@ -58,6 +64,8 @@ def self.migrate_adminset(adminset)
       # access created and associated with the collection.  Any collection without collection type gid as nil or assigned
       # the default collection type are ignored.
       def self.repair_migrated_collections
+        Deprecation.warn('This migration tool will be removed in Hyrax 4.0.0.')
+
         Rails.logger.info "*** Repairing migrated collections"
         ::Collection.all.each do |col|
           repair_migrated_collection(col)
@@ -76,11 +84,11 @@ def self.repair_migrated_collections
       #
       # @param collection [::Collection] collection object to be migrated/repaired
       def self.repair_migrated_collection(collection)
-        return if collection.collection_type_gid.present? && collection.collection_type_gid != Hyrax::CollectionType.find_or_create_default_collection_type.gid
-        collection.collection_type_gid = Hyrax::CollectionType.find_or_create_default_collection_type.gid
+        return if collection.collection_type_gid.present? && collection.collection_type_gid != Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id
+        collection.collection_type_gid = Hyrax::CollectionType.find_or_create_default_collection_type.to_global_id
         permission_template = Hyrax::PermissionTemplate.find_by(source_id: collection.id)
         if permission_template.present?
-          collection.reset_access_controls!
+          permission_template.reset_access_controls_for(collection: collection, interpret_visibility: true)
         else
           create_permissions(collection)
         end
diff --git a/app/services/hyrax/collections/permissions_service.rb b/app/services/hyrax/collections/permissions_service.rb
deleted file mode 100644
index 571e5c9d..00000000
--- a/app/services/hyrax/collections/permissions_service.rb
+++ /dev/null
@@ -1,258 +0,0 @@
-# frozen_string_literal: true
-module Hyrax
-  module Collections
-    class PermissionsService
-      # @api private
-      #
-      # IDs of collections/or admin_sets a user can access based on participant roles.
-      #
-      # @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param source_type [String] 'collection', 'admin_set', or nil to get all types
-      # @param exclude_groups [Array<String>] name of groups to exclude from the results
-      # @return [Array<String>] IDs of collections and admin sets for which the user has specified roles
-      def self.source_ids_for_user(access:, ability:, source_type: nil, exclude_groups: [])
-        scope = PermissionTemplateAccess.for_user(ability: ability, access: access, exclude_groups: exclude_groups)
-                                        .joins(:permission_template)
-        ids = scope.pluck(Arel.sql('DISTINCT source_id'))
-        return ids unless source_type
-        filter_source(source_type: source_type, ids: ids)
-      end
-      private_class_method :source_ids_for_user
-
-      def self.filter_source(source_type:, ids:)
-        return [] if ids.empty?
-        id_clause = "{!terms f=id}#{ids.join(',')}"
-        query = case source_type
-                when 'admin_set'
-                  "_query_:\"{!raw f=has_model_ssim}AdminSet\""
-                when 'collection'
-                  "_query_:\"{!raw f=has_model_ssim}Collection\""
-                end
-        query += " AND #{id_clause}"
-        ActiveFedora::SolrService.query(query, fl: 'id', rows: ids.count, method: :post).map do |hit|
-          hit['id'] unless hit.empty?
-        end
-      end
-      private_class_method :filter_source
-
-      # @api private
-      #
-      # IDs of admin sets a user can access based on participant roles.
-      #
-      # @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Array<String>] IDs of admin sets for which the user has specified roles
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      # TODO: MOVE TO ABILITY
-      def self.admin_set_ids_for_user(access:, ability:)
-        source_ids_for_user(access: access, ability: ability, source_type: 'admin_set')
-      end
-      private_class_method :admin_set_ids_for_user
-
-      # @api public
-      #
-      # IDs of collections a user can access based on participant roles.
-      #
-      # @param access [Array<String>] one or more types of access (e.g. Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT, Hyrax::PermissionTemplateAccess::VIEW)
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Array<String>] IDs of collections for which the user has specified roles
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.collection_ids_for_user(access:, ability:)
-        source_ids_for_user(access: access, ability: ability, source_type: 'collection')
-      end
-
-      # @api public
-      #
-      # IDs of collections and/or admin_sets into which a user can deposit.
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param source_type [String] 'collection', 'admin_set', or nil to get all types
-      # @param exclude_groups [Array<String>] name of groups to exclude from the results
-      # @return [Array<String>] IDs of collections and/or admin_sets into which the user can deposit
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.source_ids_for_deposit(ability:, source_type: nil, exclude_groups: [])
-        access = [Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::DEPOSIT]
-        source_ids_for_user(access: access, ability: ability, source_type: source_type, exclude_groups: exclude_groups)
-      end
-
-      # @api public
-      #
-      # IDs of collections and/or admin_sets that a user can manage.
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param source_type [String] 'collection', 'admin_set', or nil to get all types
-      # @return [Array<String>] IDs of collections and/or admin_sets that the user can manage
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.source_ids_for_manage(ability:, source_type: nil)
-        access = [Hyrax::PermissionTemplateAccess::MANAGE, Hyrax::PermissionTemplateAccess::MANAGE]
-        source_ids_for_user(access: access, ability: ability, source_type: source_type)
-      end
-
-      # @api public
-      #
-      # IDs of collections into which a user can deposit.
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Array<String>] IDs of collections into which the user can deposit
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.collection_ids_for_deposit(ability:)
-        source_ids_for_deposit(ability: ability, source_type: 'collection')
-      end
-
-      # @api public
-      #
-      # IDs of collections which the user can view.
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Array<String>] IDs of collections into which the user can view
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.collection_ids_for_view(ability:)
-        collection_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE,
-                                                           Hyrax::PermissionTemplateAccess::DEPOSIT,
-                                                           Hyrax::PermissionTemplateAccess::VIEW])
-      end
-
-      # @api public
-      #
-      # Determine if the given user has permissions to view the admin show page for at least one collection
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Boolean] true if the user has permission to view the admin show page for at least one collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.can_view_admin_show_for_any_collection?(ability:)
-        collection_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE,
-                                                           Hyrax::PermissionTemplateAccess::DEPOSIT,
-                                                           Hyrax::PermissionTemplateAccess::VIEW]).present?
-      end
-
-      # @api public
-      #
-      # Determine if the given user has permissions to view the admin show page for at least one admin set
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Boolean] true if the user has permission to view the admin show page for at least one admin_set
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      # TODO: MOVE TO ABILITY
-      def self.can_view_admin_show_for_any_admin_set?(ability:)
-        admin_set_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE,
-                                                          Hyrax::PermissionTemplateAccess::DEPOSIT,
-                                                          Hyrax::PermissionTemplateAccess::VIEW]).present?
-      end
-
-      # @api public
-      #
-      # Determine if the given user has permissions to manage at least one collection
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Boolean] true if the user has permission to manage at least one collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.can_manage_any_collection?(ability:)
-        collection_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE]).present?
-      end
-
-      # @api public
-      #
-      # Determine if the given user has permissions to manage at least one admin set
-      #
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Boolean] true if the user has permission to manage at least one admin_set
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      # TODO: MOVE TO ABILITY
-
-      def self.can_manage_any_admin_set?(ability:)
-        admin_set_ids_for_user(ability: ability, access: [Hyrax::PermissionTemplateAccess::MANAGE]).present?
-      end
-
-      # @api public
-      #
-      # Determine if the given user has permissions to deposit into the given collection
-      #
-      # @param collection_id [String] id of the collection we are checking permissions on
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Boolean] true if the user has permission to deposit into the collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.can_deposit_in_collection?(collection_id:, ability:)
-        deposit_access_to_collection?(collection_id: collection_id, ability: ability) ||
-          manage_access_to_collection?(collection_id: collection_id, ability: ability)
-      end
-
-      # @api public
-      #
-      # Determine if the given user has permissions to view the admin show page for the collection
-      #
-      # @param collection_id [String] id of the collection we are checking permissions on
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @return [Boolean] true if the user has permission to view the admin show page for the collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.can_view_admin_show_for_collection?(collection_id:, ability:)
-        exclude_groups = [::Ability.registered_group_name,
-                          ::Ability.public_group_name]
-        manage_access_to_collection?(collection_id: collection_id, ability: ability) ||
-          deposit_access_to_collection?(collection_id: collection_id, ability: ability, exclude_groups: exclude_groups) ||
-          view_access_to_collection?(collection_id: collection_id, ability: ability, exclude_groups: exclude_groups)
-      end
-
-      # @api private
-      #
-      # Determine if the given user has :deposit access for the given collection
-      #
-      # @param collection_id [String] id of the collection we are checking permissions on
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param exclude_groups [Array<String>] name of groups to exclude from the results
-      # @return [Boolean] true if the user has :deposit access to the collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.deposit_access_to_collection?(collection_id:, ability: nil, exclude_groups: [])
-        access_to_collection?(collection_id: collection_id, access: 'deposit', ability: ability, exclude_groups: exclude_groups)
-      end
-      private_class_method :deposit_access_to_collection?
-
-      # @api private
-      #
-      # Determine if the given user has :manage access for the given collection
-      #
-      # @param collection_id [String] id of the collection we are checking permissions on
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param exclude_groups [Array<String>] name of groups to exclude from the results
-      # @return [Boolean] true if the user has :manage access to the collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.manage_access_to_collection?(collection_id:, ability:, exclude_groups: [])
-        access_to_collection?(collection_id: collection_id, access: 'manage', ability: ability, exclude_groups: exclude_groups)
-      end
-      private_class_method :manage_access_to_collection?
-
-      # @api private
-      #
-      # Determine if the given user has :view access for the given collection
-      #
-      # @param collection_id [String] id of the collection we are checking permissions on
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param exclude_groups [Array<String>] name of groups to exclude from the results
-      # @return [Boolean] true if the user has permission to view the collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.view_access_to_collection?(collection_id:, ability:, exclude_groups: [])
-        access_to_collection?(collection_id: collection_id, access: 'view', ability: ability, exclude_groups: exclude_groups)
-      end
-      private_class_method :view_access_to_collection?
-
-      # @api private
-      #
-      # Determine if the given user has specified access for the given collection
-      #
-      # @param collection_id [String] id of the collection we are checking permissions on
-      # @param access [Symbol] the access level to check
-      # @param ability [Ability] the ability coming from cancan ability check
-      # @param exclude_groups [Array<String>] name of groups to exclude from the results
-      # @return [Boolean] true if the user has permission to view the collection
-      # @note Several checks get the user's groups from the user's ability.  The same values can be retrieved directly from a passed in ability.
-      def self.access_to_collection?(collection_id:, access:, ability:, exclude_groups: [])
-        return false unless collection_id
-        template = Hyrax::PermissionTemplate.find_by!(source_id: collection_id)
-        return true if ([ability.current_user.user_key] & template.agent_ids_for(agent_type: 'user', access: access)).present?
-        return true if (ability.user_groups & (template.agent_ids_for(agent_type: 'group', access: access) - exclude_groups)).present?
-        false
-      end
-      private_class_method :access_to_collection?
-    end
-  end
-end
diff --git a/app/services/hyrax/repository_fixity_check_service.rb b/app/services/hyrax/repository_fixity_check_service.rb
index 3f428994..f30347dc 100644
--- a/app/services/hyrax/repository_fixity_check_service.rb
+++ b/app/services/hyrax/repository_fixity_check_service.rb
@@ -5,7 +5,7 @@ class RepositoryFixityCheckService
     # etc. It is not otherwise called or relied upon in Hyrax.
     # @see https://github.com/samvera/hyrax/wiki/Hyrax-Management-Guide#fixity-checking
     def self.fixity_check_everything
-      results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(has_model_ssim: "FileSet"), rows: 500_000, fl: 'id')
+      results = Hyrax::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(has_model_ssim: "FileSet"), rows: 500_000, fl: 'id')
       ids = results.map { |o| o['id'] }
       ids.each do |fs|
         file_set = ::FileSet.find(fs)
@@ -26,7 +26,7 @@ def self.fixity_check_fileset(id)
 
     def self.fixity_check_random_sampling
       # current count 174884
-      results = ActiveFedora::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(has_model_ssim: "FileSet"), rows: 500_000, fl: 'id')
+      results = Hyrax::SolrService.query(ActiveFedora::SolrQueryBuilder.construct_query(has_model_ssim: "FileSet"), rows: 500_000, fl: 'id')
       ids = results.map { |o| o['id'] }
       random_sample = ids.sample(2000)
       count = 0
diff --git a/app/services/hyrax/workflow/permission_query.rb b/app/services/hyrax/workflow/permission_query.rb
deleted file mode 100644
index dcd75da0..00000000
--- a/app/services/hyrax/workflow/permission_query.rb
+++ /dev/null
@@ -1,440 +0,0 @@
-# Patching to add Arel to various database calls, solving:
-#    Dangerous query method (method whose arguments are used as raw SQL) called with non-attribute argument(s)
-# This can be removed when updating to Hyrax 3, as it is resolved in the source there.
-# Lines 60, 436
-
-module Hyrax
-  module Workflow
-    # Welcome intrepid developer. You have stumbled into some complex data
-    # interactions. There are a lot of data collaborators regarding these tests.
-    # I would love this to be more in isolation, but that is not in the cards as
-    # there are at least 16 database tables interacting to ultimately answer the
-    # following question:
-    #
-    # * What actions can a given user take on an entity?
-    #
-    # Could there be more efficient queries? Yes. However, the composition of
-    # queries has proven to be a very powerful means of understanding and
-    # exploring the problem.
-    #
-    # @note There is an indication of public or private api. The intent of this
-    #   is to differentiate what are methods that are the primary entry points
-    #   as understood as of the commit that has the @api tag. However, these are
-    #   public methods because they have been tested in isolation and are used
-    #   to help compose the `@api public` methods.
-    module PermissionQuery
-      module_function
-
-      def entity_responsibilities
-        @entity_responsibilities ||= Sipity::EntitySpecificResponsibility.arel_table
-      end
-
-      def workflow_responsibilities
-        @workflow_responsibilities ||= Sipity::WorkflowResponsibility.arel_table
-      end
-
-      def workflow_roles
-        @workflow_roles ||= Sipity::WorkflowRole.arel_table
-      end
-
-      # @api public
-      #
-      # For the given :user and :entity return only workflow actions that meet all of the following:
-      #
-      # * available for the :entity's workflow state
-      # * permitted to be taken by one or more roles in which the user is assigned
-      #   either at the workflow level or the entity level.
-      #
-      # * Actions to which the user Only actions permitted to the user
-      #
-      # @param user [User]
-      # @param entity [#to_sipity_entity] an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
-      def scope_permitted_workflow_actions_available_for_current_state(user:, entity:)
-        workflow_actions_scope = scope_workflow_actions_available_for_current_state(entity: entity)
-        workflow_state_actions_scope = scope_permitted_entity_workflow_state_actions(user: user, entity: entity)
-        workflow_actions_scope.where(
-          workflow_actions_scope.arel_table[:id].in(
-            workflow_state_actions_scope.arel_table.project(
-              workflow_state_actions_scope.arel_table[:workflow_action_id]
-            ).where(workflow_state_actions_scope.arel.constraints.reduce)
-          )
-        )
-      end
-
-      # @api public
-      #
-      # Agents associated with the given :entity and how they are associated
-      # with the given.
-      #
-      # @param entity [Object] that can be converted into a Sipity::Entity
-      # @param role [Object] that can be converted into a Sipity::Role
-      # @return [ActiveRecord::Relation<Sipity::Agent>] augmented with
-      def scope_agents_associated_with_entity_and_role(entity:, role:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        role = PowerConverter.convert_to_sipity_role(role)
-
-        agents = Sipity::Agent.arel_table
-
-        agents_select_manager = agents.project(
-          :*,
-          Arel.sql("'#{Sipity::Agent::ENTITY_LEVEL_AGENT_RELATIONSHIP}'").as('agent_processing_relationship')
-        ).where(
-          agents[:id].in(
-            entity_responsibilities.project(entity_responsibilities[:agent_id]).join(workflow_roles).on(
-              workflow_roles[:id].eq(entity_responsibilities[:workflow_role_id])
-            ).where(
-              entity_responsibilities[:entity_id].eq(entity.id).and(
-                workflow_roles[:role_id].eq(role.id)
-              )
-            )
-          )
-        ).union(
-          agents.project(
-            :*,
-            Arel.sql("'#{Sipity::Agent::WORKFLOW_LEVEL_AGENT_RELATIONSHIP}'").as('agent_processing_relationship')
-          ).where(
-            agents[:id].in(
-              workflow_responsibilities.project(workflow_responsibilities[:agent_id]).join(workflow_roles).on(
-                workflow_roles[:id].eq(workflow_responsibilities[:workflow_role_id])
-              ).where(
-                workflow_roles[:workflow_id].eq(entity.workflow_id).and(
-                  workflow_roles[:role_id].eq(role.id)
-                )
-              )
-            )
-          )
-        )
-        # I would love to use the following:
-        #  `Agent.find_by_sql(agents_select_manager.to_sql)`
-        #
-        # However AREL is adding an opening and closing parenthesis to the query
-        # statement. So I needed to massage that output, as follows:
-        #
-        # ```ruby
-        #  Agent.find_by_sql(
-        #    agents_select_manager.to_sql.sub(/\A\s*\(\s*(.*)\s*\)\s*\Z/,'\1')
-        #  )
-        # ```
-        #
-        # Instead I'm taking an example from:
-        # https://github.com/danshultz/mastering_active_record_sample_code/blob/a656c60ca7a2e27b5cd1aadbdf3bdc1814c37000/app/models/beer.rb#L77-L81
-        #
-        # Note, I'm making a dynamic query with a result the same as the table
-        # name of the model that I'm using.
-        Sipity::Agent.from(agents.create_table_alias(agents_select_manager, agents.table_name)).all
-      end
-
-      # @api public
-      #
-      # Roles associated with the given :entity
-      # @param entity [Object] that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::Role>]
-      def scope_roles_associated_with_the_given_entity(entity:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        return Sipity::Role.none unless entity
-        Sipity::Role.where(
-          Sipity::Role.arel_table[:id].in(
-            workflow_roles.project(workflow_roles[:role_id]).where(
-              workflow_roles[:workflow_id].eq(entity.workflow_id)
-            )
-          )
-        )
-      end
-
-      # @api public
-      #
-      # Is the user authorized to take the processing action on the given
-      # entity?
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @param action an object that can be converted into a Sipity::WorkflowAction#name
-      # @return [Boolean]
-      def authorized_for_processing?(user:, entity:, action:)
-        action_name = PowerConverter.convert_to_sipity_action_name(action)
-        scope_permitted_workflow_actions_available_for_current_state(user: user, entity: entity)
-          .find_by(Sipity::WorkflowAction.arel_table[:name].eq(action_name)).present?
-      end
-
-      # @api public
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * All of the Processing Agents directly associated with the given :user
-      #
-      # @param user [User]
-      # @return [ActiveRecord::Relation<Sipity::Agent>]
-      def scope_processing_agents_for(user:)
-        return Sipity::Agent.none if user.blank?
-        return Sipity::Agent.none unless user.persisted?
-        user_agent = PowerConverter.convert_to_sipity_agent(user)
-        group_agents = user.groups.map do |g|
-          PowerConverter.convert_to_sipity_agent(Hyrax::Group.new(g))
-        end
-        Sipity::Agent.where(id: group_agents + [user_agent])
-      end
-
-      PermissionScope = Struct.new(:entity, :workflow)
-      private_constant :PermissionScope
-
-      # @api public
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * Sipity::Entity in a state in which I have access to based on:
-      #   - The entity specific responsibility
-      #     - For which I've been assigned a role
-      #   - The workflow specific responsibility
-      #     - For which I've been assigned a role
-      #
-      # @param [User] user
-      #
-      # @return [ActiveRecord::Relation<Sipity::Entity>]
-      def scope_entities_for_the_user(user:)
-        entities = Sipity::Entity.arel_table
-        workflow_state_actions = Sipity::WorkflowStateAction.arel_table
-        workflow_states = Sipity::WorkflowState.arel_table
-        workflow_state_action_permissions = Sipity::WorkflowStateActionPermission.arel_table
-
-        user_agent_scope = scope_processing_agents_for(user: user)
-        user_agent_contraints = user_agent_scope.arel_table.project(
-          user_agent_scope.arel_table[:id]
-        ).where(user_agent_scope.arel.constraints)
-
-        join_builder = lambda do |responsibility|
-          entities.project(
-            entities[:id]
-          ).join(workflow_state_actions).on(
-            workflow_state_actions[:originating_workflow_state_id].eq(entities[:workflow_state_id])
-          ).join(workflow_state_action_permissions).on(
-            workflow_state_action_permissions[:workflow_state_action_id].eq(workflow_state_actions[:id])
-          ).join(workflow_states).on(
-            workflow_states[:id].eq(workflow_state_actions[:originating_workflow_state_id])
-          ).join(responsibility).on(
-            responsibility[:workflow_role_id].eq(workflow_state_action_permissions[:workflow_role_id])
-          )
-        end
-
-        where_builder = ->(responsibility) { responsibility[:agent_id].in(user_agent_contraints) }
-
-        entity_specific_joins = join_builder.call(entity_responsibilities)
-        workflow_specific_joins = join_builder.call(workflow_responsibilities)
-
-        entity_specific_where = where_builder.call(entity_responsibilities).and(
-          entities[:id].eq(entity_responsibilities[:entity_id])
-        )
-        workflow_specific_where = where_builder.call(workflow_responsibilities)
-
-        Sipity::Entity.where(
-          entities[:id].in(entity_specific_joins.where(entity_specific_where))
-          .or(entities[:id].in(workflow_specific_joins.where(workflow_specific_where)))
-        )
-      end
-
-      # @api public
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * Users that are directly associated with the given entity through one or
-      #   more of the given roles within the entity's workflow
-      # * Users that are indirectly associated with the given entity by group
-      #   and role.
-      #
-      # @param roles [Sipity::Role]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<User>]
-      def scope_users_for_entity_and_roles(entity:, roles:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        role_ids = Array.wrap(roles).map { |role| PowerConverter.convert_to_sipity_role(role).id }
-        user_polymorphic_type = PowerConverter.convert_to_polymorphic_type(::User)
-
-        user_table = ::User.arel_table
-        agent_table = Sipity::Agent.arel_table
-
-        workflow_role_id_subquery = workflow_roles.project(workflow_roles[:id]).where(
-          workflow_roles[:workflow_id].eq(entity.workflow_id).and(workflow_roles[:role_id].in(role_ids))
-        )
-
-        workflow_agent_id_subquery = workflow_responsibilities.project(workflow_responsibilities[:agent_id]).where(
-          workflow_responsibilities[:workflow_role_id].in(workflow_role_id_subquery)
-        )
-
-        entity_agent_id_subquery = entity_responsibilities.project(entity_responsibilities[:agent_id]).where(
-          entity_responsibilities[:workflow_role_id].in(workflow_role_id_subquery)
-            .and(entity_responsibilities[:entity_id].eq(entity.id))
-        )
-
-        # Default to "integer" for adapters like Postgres and Sqlite, but cast
-        # to "signed" for Mysql. The type CAST causes a SQL syntax error for an
-        # unsupported type depending on which adapter is being used.
-        type = ActiveRecord::Base.connection.adapter_name.casecmp("mysql2").zero? ? "signed" : "integer"
-        cast = Arel::Nodes::NamedFunction.new "CAST", [agent_table[:proxy_for_id].as(type)]
-
-        sub_query_for_user = agent_table.project(cast).where(
-          agent_table[:id].in(workflow_agent_id_subquery)
-            .or(agent_table[:id].in(entity_agent_id_subquery))
-        ).where(
-          agent_table[:proxy_for_type].eq(user_polymorphic_type)
-        )
-
-        ::User.where(user_table[:id].in(sub_query_for_user))
-      end
-
-      def user_emails_for_entity_and_roles(entity:, roles:)
-        scope_users_for_entity_and_roles(entity: entity, roles: roles).pluck(:email)
-      end
-
-      # @api public
-      #
-      # For the given :user and :entity, return an ActiveRecord::Relation that,
-      # if resolved, will be all of the assocated workflow roles for both the
-      # workflow responsibilities and the entity specific responsibilities.
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_entity(user:, entity:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        workflow_scope = scope_processing_workflow_roles_for_user_and_workflow(user: user, workflow: entity.workflow)
-
-        entity_specific_scope = scope_processing_workflow_roles_for_user_and_entity_specific(user: user, entity: entity)
-        Sipity::WorkflowRole.where(
-          workflow_scope.arel.constraints.reduce.or(entity_specific_scope.arel.constraints.reduce)
-        )
-      end
-
-      # @api private
-      #
-      # For the given :user and :workflow, return an ActiveRecord::Relation that,
-      # if resolved, will be all of the assocated workflow roles that are
-      # assigned to directly to the workflow.
-      #
-      # @param user [User]
-      # @param workflow [Sipity::Workflow]
-      # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_workflow(user:, workflow:)
-        agent_constraints = scope_processing_agents_for(user: user)
-        workflow_role_subquery = workflow_roles[:id].in(
-          workflow_responsibilities.project(workflow_responsibilities[:workflow_role_id])
-          .where(
-            workflow_responsibilities[:agent_id].in(
-              agent_constraints.arel_table.project(
-                agent_constraints.arel_table[:id]
-              ).where(agent_constraints.arel.constraints)
-            )
-          )
-        )
-        Sipity::WorkflowRole.where(
-          workflow_roles[:workflow_id].eq(workflow.id).and(workflow_role_subquery)
-        )
-      end
-
-      # @api private
-      #
-      # For the given :user and :entity, return an ActiveRecord::Relation that,
-      # if resolved, will be all of the assocated workflow roles that are
-      # assigned to specifically to the entity (and not the parent workflow).
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowRole>]
-      def scope_processing_workflow_roles_for_user_and_entity_specific(user:, entity:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        agent_scope = scope_processing_agents_for(user: user)
-
-        Sipity::WorkflowRole.where(
-          workflow_roles[:id].in(
-            entity_responsibilities.project(entity_responsibilities[:workflow_role_id])
-            .where(
-              entity_responsibilities[:agent_id].in(
-                agent_scope.arel_table.project(
-                  agent_scope.arel_table[:id]
-                ).where(
-                  agent_scope.arel.constraints.reduce.and(entity_responsibilities[:entity_id].eq(entity.id))
-                )
-              )
-            )
-          )
-        )
-      end
-
-      # @api private
-      #
-      # For the given :user and :entity, return an ActiveRecord::Relation,
-      # that if resolved, will be collection of
-      # Sipity::WorkflowStateAction object to which the user has
-      # permission to do something.
-      #
-      # An ActiveRecord::Relation scope that meets the following criteria:
-      #
-      # * The actions are available for the given entity's current state
-      # * The actions are available for the given user based on their role.
-      #   Either:
-      #   - Directly via an agent associated with a user
-      #   - Indirectly via an agent associated with a group
-      #
-      # @param user [User]
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowStateAction>]
-      def scope_permitted_entity_workflow_state_actions(user:, entity:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        workflow_state_actions = Sipity::WorkflowStateAction
-        permissions = Sipity::WorkflowStateActionPermission
-        role_scope = scope_processing_workflow_roles_for_user_and_entity(user: user, entity: entity)
-
-        workflow_state_actions.where(
-          workflow_state_actions.arel_table[:originating_workflow_state_id].eq(entity.workflow_state_id).and(
-            workflow_state_actions.arel_table[:id].in(
-              permissions.arel_table.project(
-                permissions.arel_table[:workflow_state_action_id]
-              ).where(
-                permissions.arel_table[:workflow_role_id].in(
-                  role_scope.arel_table.project(role_scope.arel_table[:id]).where(
-                    role_scope.arel.constraints.reduce
-                  )
-                )
-              )
-            )
-          )
-        )
-      end
-
-      # @api public
-      #
-      # For the given :entity return an ActiveRecord::Relation that when
-      # resolved will be only the workflow actions that:
-      #
-      # * Are available for the entity's workflow_state
-      #
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
-      def scope_workflow_actions_for_current_state(entity:)
-        entity = PowerConverter.convert_to_sipity_entity(entity)
-        state_actions_table = Sipity::WorkflowStateAction.arel_table
-        Sipity::WorkflowAction.where(
-          Sipity::WorkflowAction.arel_table[:id].in(
-            state_actions_table.project(state_actions_table[:workflow_action_id])
-              .where(state_actions_table[:originating_workflow_state_id].eq(entity.workflow_state_id))
-          )
-        )
-      end
-
-      # @api private
-      #
-      # For the given :entity, return an ActiveRecord::Relation, that
-      # if resolved, that lists all of the actions available for the entity and
-      # its current state.
-      #
-      # * All actions that are associated with actions that do not have prerequsites
-      # * All actions that have prerequisites and all of those prerequisites are complete
-      #
-      # @param entity an object that can be converted into a Sipity::Entity
-      # @return [ActiveRecord::Relation<Sipity::WorkflowAction>]
-      def scope_workflow_actions_available_for_current_state(entity:)
-        workflow_actions_for_current_state = scope_workflow_actions_for_current_state(entity: entity)
-        Sipity::WorkflowAction.where(workflow_actions_for_current_state.arel.constraints.reduce)
-      end
-    end
-  end
-end
diff --git a/app/views/hyrax/admin/admin_sets/index.html.erb b/app/views/hyrax/admin/admin_sets/index.html.erb
index 99351903..7ace143e 100644
--- a/app/views/hyrax/admin/admin_sets/index.html.erb
+++ b/app/views/hyrax/admin/admin_sets/index.html.erb
@@ -1,8 +1,10 @@
 <% provide :page_header do %>
+  <% # Override Note: removed aria-hidden="true" from fa-sitemap %>
   <h1><span class="fa fa-sitemap"></span> Administrative Sets</h1>
   <%if can? :create, AdminSet %>
     <div class="pull-right">
       <%= link_to hyrax.new_admin_admin_set_path, class: 'btn btn-primary' do %>
+        <% # Override Note: removed aria-hidden="true" from fa-edit %>
         <span class="fa fa-edit"></span> <%= t(:'helpers.action.admin_set.new') %>
       <% end %>
     </div>
@@ -27,6 +29,7 @@
               <tr>
                 <td><%= link_to admin_set.title.first, [hyrax, :admin, admin_set] %></td>
                 <td><%= admin_set.create_date %></td>
+                <!-- Override Note: added || [""] -->
                 <td><%= safe_join(admin_set.creator || [""]) %></td>
                 <td><%= controller.presenter_class.new(admin_set, current_ability).total_items %></td>
               </tr>
diff --git a/app/views/hyrax/admin/stats/_top_data.html.erb b/app/views/hyrax/admin/stats/_top_data.html.erb
deleted file mode 100644
index 9890ab9d..00000000
--- a/app/views/hyrax/admin/stats/_top_data.html.erb
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2>Top File Formats and Users</h2>
-<h3>Statistics in this section shows the top <%= @presenter.limit %> items for each category</h3>
-<% if @presenter.limit == 5 %>
-  <p><%= link_to "View top 20", hyrax.admin_stats_path(limit: '20') %> </p>
-<% else %>
-  <p><%= link_to "View top 5", hyrax.admin_stats_path %> </p>
-<% end %>
-
-<h3>Top File Formats (top <%= @presenter.top_formats.count %>)</h3>
-<ul>
-  <% @presenter.top_formats.each do |fmt| %>
-    <li><%= fmt.label %> <span class="count">(<%= fmt.value %>)</span></li>
-  <% end %>
-</ul>
-
-<br />
-<h3>Most Active Users (top <%= @presenter.active_users.count %>)</h3>
-<ul>
-  <% @presenter.active_users.each do |user| %>
-    <li>
-      <%= link_to_profile(user.label) %> <span class="count">(<%= user.value %>)</span>
-    </li>
-  <% end %>
-</ul>
diff --git a/app/views/hyrax/admin/stats/show.html.erb b/app/views/hyrax/admin/stats/show.html.erb
deleted file mode 100644
index 99373173..00000000
--- a/app/views/hyrax/admin/stats/show.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="row">
-  <div class="col-sm-12 stats-container">
-    <%= render "stats_by_date" %>
-    <hr/>
-    <%= render "top_data" %>
-  </div>
-</div>
diff --git a/app/views/hyrax/base/_form_child_work_relationships.html.erb b/app/views/hyrax/base/_form_child_work_relationships.html.erb
deleted file mode 100644
index 34df4914..00000000
--- a/app/views/hyrax/base/_form_child_work_relationships.html.erb
+++ /dev/null
@@ -1,48 +0,0 @@
-<% # REMOVE when updating to hyrax 2.9.5 https://github.com/samvera/hyrax/releases/tag/v2.9.5 %>
-<%# Form UI behavior code and details;
-Code:
-  app/assets/javascripts/hyrax/relationships
-CSS:
-  [data-behavior="remove-relationship"] : Button to remove its parent TR from the table
-  [data-behavior="add-relationship"] : Button to clone its parent TR and inject a new row into the table
-  .message.has-warning : Used to display UI errors related to input values and server errors
-HTML Properties:
-  table:
-    [data-behavior="child-relationships"] : allows the javascript to be initialized
-    data-param-key : the parameter key value for this model type %>
-<div class="form-group" data-behavior="child-relationships" data-param-key="<%= f.object.model_name.param_key %>" data-members="<%= f.object.work_members_json %>">
-  <div class="form-inline">
-      <%= f.label :find_child_work %>
-      <%= f.input_field :find_child_work,
-                        prompt: :translate,
-                        autocomplete: 'off',
-                        data: {
-                          autocomplete: 'work',
-                          'autocomplete-url' => Rails.application.routes.url_helpers.qa_path + '/search/find_works',
-                          'exclude-work': f.object.model.id # exclude this item from the result set.
-                        } %>
-      <a class="btn btn-primary" data-behavior="add-relationship">Add</a>
-  </div>
-  <div class="message has-warning hidden"></div>
-  <div style="margin-top: 10px">
-    <%= link_to t('.attach_new_work'), polymorphic_path([main_app, :new, :hyrax, :parent, curation_concern.model_name.singular.to_sym], parent_id: curation_concern.id), target: "_blank", class: 'btn btn-primary' %>
-  </div>
-  <table class="table table-striped">
-    <caption><%= t('.caption') %></caption>
-    <thead>
-    <tr>
-      <th><%= t('.header.title') %></th>
-      <th><%= t('.header.actions') %></th>
-    </tr>
-    </thead>
-    <tbody>
-    </tbody>
-  </table>
-</div>
-
-<script type="text/x-tmpl" id="tmpl-child-work">
-<tr>
-  <td>{%= o.title %}</td>
-  <td><button class="btn btn-danger" data-behavior="remove-relationship" data-confirm-text="<%= t('.confirm.text') %>" data-confirm-cancel="<%= t('.confirm.cancel') %>" data-confirm-remove="<%= t('.confirm.remove') %>"><%= t('.actions.remove') %></button></td>
-</tr>
-</script>
diff --git a/app/views/hyrax/base/_form_media.html.erb b/app/views/hyrax/base/_form_media.html.erb
index 04c76d78..e8316d21 100644
--- a/app/views/hyrax/base/_form_media.html.erb
+++ b/app/views/hyrax/base/_form_media.html.erb
@@ -2,6 +2,7 @@
   <div class="well form-media">
     <%= render 'form_representative', f: f %>
     <%= render 'form_thumbnail', f: f %>
+    <% #Overide Note: Removed form_rendering %>
   </div>
 <% end %>
 
diff --git a/app/views/hyrax/base/_form_progress.html.erb b/app/views/hyrax/base/_form_progress.html.erb
index d7595e5b..79806e11 100644
--- a/app/views/hyrax/base/_form_progress.html.erb
+++ b/app/views/hyrax/base/_form_progress.html.erb
@@ -19,11 +19,11 @@
     </div>
 
     <div class="set-access-controls list-group-item">
-      <%= render 'form_visibility_component', f: f %>
+      <%= render 'form_visibility_component', f: f, save_work: true %>
     </div>
     <% unless current_user.can_make_deposits_for.empty? %>
         <div class="list-group-item">
-          <%= f.input :on_behalf_of, collection: current_user.can_make_deposits_for.map(&:user_key), prompt: "Yourself" %>
+          <%= f.input :on_behalf_of, label: t(".proxy_depositors"), collection: current_user.can_make_deposits_for, prompt: t(".yourself"), value_method: :user_key %>
         </div>
     <% end %>
   </div>
diff --git a/app/views/hyrax/base/_guts4form.html.erb b/app/views/hyrax/base/_guts4form.html.erb
index a197ad75..807d3510 100644
--- a/app/views/hyrax/base/_guts4form.html.erb
+++ b/app/views/hyrax/base/_guts4form.html.erb
@@ -1,25 +1,26 @@
 <% # we will yield to content_for for each tab, e.g. :files_tab %>
+<% # TODO: Not passing tabs local param to this partial is deprecated and the tabs param will be required in Hyrax 3.0 Need to review this throughly %>
 <% tabs ||= %w[metadata files relationships] # default tab order %>
 <div class="row">
   <div class="col-xs-12 col-sm-8">
     <div class="panel panel-default tabs" role="main">
       <!-- Nav tabs -->
       <ul class="nav nav-tabs" role="tablist">
-        <% tabs.each_with_index do | tab, i | %>
+        <% (tabs - ['share']).each_with_index do | tab, i | %>
           <% if i == 0 %>
             <li role="presentation" class="active">
           <% else %>
             <li role="presentation">
           <% end %>
               <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-                <%= t("hyrax.works.form.tab.#{tab}") %>
+                <%= form_tab_label_for(form: f.object, tab: tab) %>
               </a>
             </li>
         <% end %>
 
         <li role="presentation" id="tab-share" class="hidden">
           <a href="#share" aria-controls="share" role="tab" data-toggle="tab">
-            <%= t("hyrax.works.form.tab.share") %>
+            <%= form_tab_label_for(form: f.object, tab: 'share') %>
           </a>
         </li>
       </ul>
@@ -48,24 +49,26 @@
       </div>
     </div>
   </div>
-    <div class="save-controls">
-  <% if @curation_concern.persisted?  %>
-    <% workflow_status_with_draft = Tufts::WorkflowStatus.status(@curation_concern.id) %>
-    <% unless workflow_status_with_draft == 'unpublished'%>
-   <div class="col-xs-12 col-sm-4">
-      <div class="panel panel-default">
-          <div class="panel-heading">
-              <h3 class="panel-title">Manage Draft</h3>
-          </div>
-          <div class="list-group-item">
-              <%= react_component('DraftControls', {curation_concern_id: curation_concern.id, draft_saved: curation_concern.draft_saved?}, {camelize_props: true}) %>
-          </div>
-      </div>
-  </div>
+  <% # We added the save-controls div and moved the widget inside of it. Everythign inside the if is our code. %>
+  <div class="save-controls">
+    <% # Unsure if @curation_concern was populated follow concerns/hyrax/collections_controller_behavior.rb %>
+    <% if @curation_concern.persisted?  %>
+      <% workflow_status_with_draft = Tufts::WorkflowStatus.status(@curation_concern.id) %>
+      <% unless workflow_status_with_draft == 'unpublished'%>
+         <div class="col-xs-12 col-sm-4">
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">Manage Draft</h3>
+                </div>
+                <div class="list-group-item">
+                    <%= react_component('DraftControls', {curation_concern_id: curation_concern.id, draft_saved: curation_concern.draft_saved?}, {camelize_props: true}) %>
+                </div>
+            </div>
+        </div>
+      <% end %>
     <% end %>
-  <% end %>
-  <div id="savewidget" class="col-xs-12 col-sm-4 fixedsticky" role="complementary">
-    <%= render 'form_progress', f: f %>
-  </div>
+    <div id="savewidget" class="col-xs-12 col-sm-4 fixedsticky" role="complementary">
+      <%= render 'form_progress', f: f %>
+    </div>
   </div>
 </div>
diff --git a/app/views/hyrax/base/_metadata.html.erb b/app/views/hyrax/base/_metadata.html.erb
index 645070d2..b2b8e45a 100644
--- a/app/views/hyrax/base/_metadata.html.erb
+++ b/app/views/hyrax/base/_metadata.html.erb
@@ -7,5 +7,6 @@
     <%= render 'attribute_rows', presenter: presenter %>
     <%= presenter.attribute_to_html(:embargo_release_date, render_as: :date) %>
     <%= presenter.attribute_to_html(:lease_expiration_date, render_as: :date) %>
+    <% # Override Note: we removed licence attribute %>
   </tbody>
 </table>
diff --git a/app/views/hyrax/base/_show_actions.html.erb b/app/views/hyrax/base/_show_actions.html.erb
index 9aa73641..23b828b2 100644
--- a/app/views/hyrax/base/_show_actions.html.erb
+++ b/app/views/hyrax/base/_show_actions.html.erb
@@ -1,3 +1,4 @@
+<% # TODO Override Note: not sure what this override is for %>
 <span class="work-id" data-work-id="<%= presenter.id %>"></span>
   <script>
     Tufts.qrStatus()
diff --git a/app/views/hyrax/base/_work_description.html.erb b/app/views/hyrax/base/_work_description.html.erb
index f34840d5..fe5aad53 100644
--- a/app/views/hyrax/base/_work_description.html.erb
+++ b/app/views/hyrax/base/_work_description.html.erb
@@ -1,8 +1,10 @@
+<% # Override Note: We added this unless %>
 <% unless presenter.description.nil? %>
   <% presenter.description.each do |description| %>
     <p class="work_description"><%= iconify_auto_link(description.html_safe) %></p>
   <% end %>
 <% end %>
+<% # Override Note: We added modified-info %>
 <ul class="modified-info">
     <li>
         <span class="modified-info__label">Ingested</span>
diff --git a/app/views/hyrax/base/_work_title.html.erb b/app/views/hyrax/base/_work_title.html.erb
index 30041444..e91b9764 100644
--- a/app/views/hyrax/base/_work_title.html.erb
+++ b/app/views/hyrax/base/_work_title.html.erb
@@ -1,3 +1,4 @@
+<% # TODO Override Note: not sure what this override is for %>
 <% presenter.title.each_with_index do |title, index| %>
     <% if index == 0 %>
         <h1>
diff --git a/app/views/hyrax/base/edit.html.erb b/app/views/hyrax/base/edit.html.erb
index 422f6686..d18c416d 100644
--- a/app/views/hyrax/base/edit.html.erb
+++ b/app/views/hyrax/base/edit.html.erb
@@ -1,5 +1,6 @@
-<% provide :page_title, curation_concern_page_title(curation_concern) %>
+<% provide :page_title, title_presenter(curation_concern).page_title %>
 <% provide :page_header do %>
+<% # Override Note: We removed aria-hidden %>
 <h1><%= t("hyrax.works.update.header") %></h1>
 <% end %>
 
diff --git a/app/views/hyrax/base/show.html.erb b/app/views/hyrax/base/show.html.erb
deleted file mode 100644
index b5358d3f..00000000
--- a/app/views/hyrax/base/show.html.erb
+++ /dev/null
@@ -1,57 +0,0 @@
-<% provide :page_title, @presenter.page_title %>
-
-<%= render 'shared/citations' %>
-
-<div class="row work-type">
-  <div class="col-sm-12">
-    <%= render 'work_type', presenter: @presenter %>
-  </div>
-  <div itemscope itemtype="http://schema.org/CreativeWork" class="col-xs-12">
-    <%= render 'work_title', presenter: @presenter %>
-    <%= render 'show_actions', presenter: @presenter %>
-    <div class="panel panel-default">
-      <div class="panel-body">
-        <div class="row">
-          <%= render 'workflow_actions_widget', presenter: @presenter %>
-          <% if @presenter.iiif_viewer? %>
-            <div class="col-sm-12">
-              <%= render 'representative_media', presenter: @presenter, viewer: true %>
-            </div>
-          <% end %>
-          <div class="col-sm-3 text-center">
-            <%= render 'representative_media', presenter: @presenter, viewer: false unless @presenter.iiif_viewer? %>
-            <%= render 'citations', presenter: @presenter %>
-            <%= render 'social_media' %>
-          </div>
-          <div class="col-sm-9">
-            <%= render 'work_description', presenter: @presenter %>
-            <%= render 'metadata', presenter: @presenter %>
-          </div>
-        </div>
-      </div>
-    </div><!-- /panel -->
-
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="panel-title"><%= t('hyrax.base.show.relationships') %></h3>
-      </div>
-      <div class="panel-body">
-        <%= render 'relationships', presenter: @presenter %>
-      </div>
-    </div>
-
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3 class="panel-title"><%= t('.items') %></h3>
-      </div>
-      <div class="panel-body">
-        <%= render 'items', presenter: @presenter %>
-      </div>
-    </div>
-
-    <%# TODO: we may consider adding these partials in the future %>
-    <%# = render 'sharing_with', presenter: @presenter %>
-    <%# = render 'user_activity', presenter: @presenter %>
-
-  </div>
-</div>
diff --git a/app/views/hyrax/collections/_show_parent_collections.html.erb b/app/views/hyrax/collections/_show_parent_collections.html.erb
index ffbedb1b..ac7f0a9d 100644
--- a/app/views/hyrax/collections/_show_parent_collections.html.erb
+++ b/app/views/hyrax/collections/_show_parent_collections.html.erb
@@ -22,16 +22,8 @@
 <% if presenter.total_parent_collections <= 0 %>
     <div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_parent_collections') %></div>
 <% else %>
+  <% # Override Note: We are replacing this sections with what is returned by draw_tree %>
   <% draw_tree(presenter) %>
-<% if false %>
-  <% presenter.parent_collections.documents.each do |document| %>
-    <ul>
-      <li>
-        <strong><%= link_to document, [hyrax, document], id: "src_copy_link_#{document.id}" %></strong>
-        <strong><%= presenter.class %></strong>
-      </li>
-    </ul>
-  <% end %>
 <% end %>
   <div class="row">
     <%= render 'hyrax/collections/paginate', solr_response: presenter.parent_collections, page_param_name: :parent_collection_page %>
diff --git a/app/views/hyrax/collections/show.html.erb b/app/views/hyrax/collections/show.html.erb
index b78cceb9..c7a48295 100644
--- a/app/views/hyrax/collections/show.html.erb
+++ b/app/views/hyrax/collections/show.html.erb
@@ -3,10 +3,10 @@
   <div class="row hyc-header">
     <div class="col-md-12">
 
-      <% unless @presenter.banner_file.blank? %>
-          <header class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
+      <% if @presenter.banner_file.present? %>
+          <div class="hyc-banner" style="background-image:url(<%= @presenter.banner_file %>)">
       <% else %>
-          <header class="hyc-generic">
+          <div class="hyc-generic">
       <% end %>
 
       <div class="hyc-title">
@@ -20,10 +20,10 @@
             <% @presenter.logo_record.each_with_index  do |lr, i| %>
 
                 <% if lr[:linkurl].blank? %>
-                    <img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>" />
+                    <img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>" onerror="this.style.display='none'"/>
                 <% else %>
                     <a href="<%= lr[:linkurl] %>">
-                      <img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>" />
+                      <img alt="<%= lr[:alttext] %>" src="<%= lr[:file_location] %>" onerror="this.style.display='none'"/>
                     </a>
                 <% end %>
 
@@ -35,7 +35,7 @@
           <div class="hyc-bugs">
             <div class="hyc-item-count">
               <b><%= @presenter.total_viewable_items %></b>
-              <%= 'Item'.pluralize(@presenter.total_viewable_items) %></div>
+              <%= pluralize(@presenter.total_viewable_items, t('.item_count')) %></div>
 
             <% unless @presenter.creator.blank? %>
                 <div class="hyc-created-by">Created by: <%= @presenter.creator.first %></div>
@@ -47,7 +47,7 @@
           </div>
       <% end %>
 
-      </header>
+      </div>
 
     </div>
   </div>
@@ -59,6 +59,7 @@
       <% if @presenter.collection_type_is_nestable? && @presenter.total_parent_collections > 0 %>
           <div class="hyc-blacklight hyc-bl-title">
             <h2>
+              <% # Override Note: removed @presenter.total_parent_collections %>
               <%= t('.parent_collection_header') %>
             </h2>
           </div>
@@ -69,7 +70,8 @@
 
     </div>
     <div class="col-md-4 hyc-metadata">
-      <% unless has_collection_search_parameters? %>
+      <%= render 'hyrax/collections/media_display', presenter: @presenter %>
+      <% unless collection_search_parameters? %>
           <h2><%= t('hyrax.dashboard.collections.show.metadata_header') %></h2>
           <%= render 'show_descriptions' %>
       <% end %>
@@ -79,11 +81,11 @@
   <!-- Search results label -->
   <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
     <div class="hyc-blacklight hyc-bl-title">
+    <% if collection_search_parameters? %>
       <h2>
-        <% if has_collection_search_parameters? %>
-            <%= t('hyrax.dashboard.collections.show.search_results') %>
-        <% end %>
+        <%= t('hyrax.dashboard.collections.show.search_results') %>
       </h2>
+    <% end %>
     </div>
   <% end %>
 
@@ -97,7 +99,7 @@
   <!-- Subcollections -->
   <% if @presenter.collection_type_is_nestable? && @subcollection_count > 0 %>
       <div class="hyc-blacklight hyc-bl-title">
-        <h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
+        <h2><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h2>
       </div>
       <div class="hyc-blacklight hyc-bl-results">
         <%= render 'subcollection_list', collection: @subcollection_docs %>
@@ -107,7 +109,7 @@
   <!-- Works -->
   <% if @members_count > 0 %>
       <div class="hyc-blacklight hyc-bl-title">
-        <h4><%= t('.works_in_collection') %> (<%= @members_count %>)</h4>
+        <h2><%= t('.works_in_collection') %> (<%= @members_count %>)</h2>
       </div>
 
       <div class="hyc-blacklight hyc-bl-sort">
@@ -123,3 +125,7 @@
       </div>
   <% end # if @members_count > 0 %>
 </div>
+
+
+<span class='hide analytics-event' data-category="collection" data-action="collection-page-view" data-name="<%= @presenter.id %>" >
+
diff --git a/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb b/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb
index 73183efb..8976c023 100644
--- a/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb
+++ b/app/views/hyrax/dashboard/collections/_form_for_select_collection.html.erb
@@ -1,3 +1,4 @@
+<% # Override Note: Todo: undestand what this overide is for, no change between 2.9 and 3.6 so leaving it alone for now %>
 <div role="dialog" class="modal collection-list-modal fade" id="collection-list-container" tabindex="-1" aria-labelledby="col_add_title" >
   <div class="modal-dialog">
       <div class="modal-content">
diff --git a/app/views/hyrax/dashboard/collections/_show_document_list.html.erb b/app/views/hyrax/dashboard/collections/_show_document_list.html.erb
index a1be89e2..f4f7d479 100644
--- a/app/views/hyrax/dashboard/collections/_show_document_list.html.erb
+++ b/app/views/hyrax/dashboard/collections/_show_document_list.html.erb
@@ -1,13 +1,17 @@
+<% # Override Note: replaced collections-list-table collection-works-table with panel %>
 <table class="table table-striped panel">
-  <caption class="sr-only">List of items in this collection</caption>
+  <caption class="sr-only"><%= t('hyrax.dashboard.collections.show_document_list.list_items_in_collection') %></caption>
   <thead>
   <tr>
     <th>&nbsp;</th>
-    <th>Title</th>
+    <th class="title-column"><%= t('hyrax.dashboard.collections.show_document_list.title') %></th>
+    <% # Override Note: TODO change this local to Date Uploaded %>
+    <!-- <th><%= t('hyrax.dashboard.collections.show_document_list.date_added') %></th>  -->
     <th>Date Uploaded</th>
-    <th>Visibility</th>
+    <% # Override Note: removed Owner talbe head %>
+    <th><%= t('hyrax.dashboard.collections.show_document_list.visibility') %></th>
     <% if current_user %>
-      <th>Action</th>
+      <th><%= t('hyrax.dashboard.collections.show_document_list.action') %></th>
     <% end %>
   </tr>
   </thead>
diff --git a/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb b/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
index 2d893453..38075ae4 100644
--- a/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
+++ b/app/views/hyrax/dashboard/collections/_show_document_list_row.html.erb
@@ -51,11 +51,11 @@
 <tr id="detail_<%= id %>"> <!--  document detail"> -->
   <td colspan="6">
     <dl class="expanded-details row">
-      <dt class="col-xs-3 col-lg-2">Creator:</dt>
+      <dt class="col-xs-3 col-lg-2"><%= t('.creator') %></dt>
       <dd class="col-xs-9 col-lg-4"><%= document.creator.to_a.to_sentence %></dd>
-      <dt class="col-xs-3 col-lg-2">Depositor:</dt>
+      <dt class="col-xs-3 col-lg-2"><%=  t('.depositor') %></dt>
       <dd class="col-xs-9 col-lg-4"><%= link_to_profile document.depositor %></dd>
-      <dt class="col-xs-3 col-lg-2">Edit Access:</dt>
+      <dt class="col-xs-3 col-lg-2"><%= t('.edit_access') %></dt>
       <dd class="col-xs-9 col-lg-10">
         <% if document.edit_groups.present? %>
           Groups: <%= document.edit_groups.join(', ') %>
diff --git a/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb b/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb
index 7382cede..7a938ec1 100644
--- a/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb
+++ b/app/views/hyrax/dashboard/collections/_show_parent_collections.html.erb
@@ -22,14 +22,8 @@
 <% if presenter.total_parent_collections <= 0 %>
   <div class="alert alert-warning" role="alert"><%= t('hyrax.collections.show.no_visible_parent_collections') %></div>
 <% else %>
-<% draw_tree(presenter) %>
-<% if false %>
-  <ul class="collections-list">
-    <% presenter.parent_collections.documents.each do |document| %>
-      <%= render 'hyrax/dashboard/collections/show_parent_collection_row', id: presenter.id, document: document %>
-    <% end %>
-  </ul>
-<% end %>
+  <% # Override Note: We are replacing this sections with what is returned by draw_tree %>
+  <% draw_tree(presenter) %>
   <div class="row">
     <%= render 'hyrax/collections/paginate', solr_response: presenter.parent_collections, page_param_name: :parent_collection_page %>
   </div>
diff --git a/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb b/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb
deleted file mode 100644
index 8fd54641..00000000
--- a/app/views/hyrax/dashboard/collections/_sort_and_per_page.html.erb
+++ /dev/null
@@ -1,32 +0,0 @@
-<div class="batch-info panel">
-  <%= render 'form_for_select_collection', user_collections: @user_collections %>
-
-  <% if params[:action] == "edit" && @response.response['numFound'] > 1 %>
-  <div class="batch-toggle">
-    <% session[:batch_edit_state] = "on" %>
-    <%= button_for_remove_selected_from_collection collection %>
-  </div>
-  <% end %>
-   <div class="sort-toggle">
-     <%# kind of hacky way to get this to work on catalog and folder controllers.  May be able to simple do {action: "index"} but I'm not sure -%>
-     <% if @response.response['numFound'] > 1 && !sort_fields.empty? %>
-        <%= form_tag collection_path(collection), method: :get, class: 'per_page form-horizontal' do %>
-             <div class="form-group form-group-lg">
-               <fieldset class="col-xs-12 col-sm-9 col-md-8 col-lg-10">
-                 <legend class="sr-only"><%= t('hyrax.sort_label') %></legend>
-                 <%= label_tag(:sort, "<span>Sort By:</span>".html_safe) %>
-                 <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
-                 <%= label_tag(:per_page) do %>
-                     Show <%= select_tag(:per_page, options_for_select(['10', '20', '50', '100'], h(params[:per_page])), title: "Number of results to display per page") %>
-                     per page
-                 <% end %>
-                 <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:per_page, :sort)) %>
-                 &nbsp;&nbsp;&nbsp;
-                 <button class="btn btn-info"><span class="glyphicon glyphicon-refresh"></span> Refresh</button>
-               </fieldset>
-               <%= render 'view_type_group' %>
-             </div>
-         <% end %>
-      <% end %>
-   </div>
-</div>
diff --git a/app/views/hyrax/dashboard/collections/show.html.erb b/app/views/hyrax/dashboard/collections/show.html.erb
index 1c1a74f8..29460c4d 100644
--- a/app/views/hyrax/dashboard/collections/show.html.erb
+++ b/app/views/hyrax/dashboard/collections/show.html.erb
@@ -20,7 +20,8 @@
           <div class="col-sm-9 collection-description-wrapper">
             <!-- Parent Collection(s) -->
             <% if @presenter.collection_type_is_nestable? && @presenter.total_parent_collections > 0 %>
-                <h4><%= t('.parent_collection_header') %> </h4>
+                <% # Override Note: removed @presenter.total_parent_collections %>
+                <h4><%= t('.parent_collection_header') %></h4>
                 <section id="parent-collections-wrapper" class="parent-collections-wrapper">
                   <%= render 'hyrax/dashboard/collections/show_parent_collections', presenter: @presenter %>
                 </section>
@@ -31,7 +32,7 @@
               <%= render 'hyrax/collections/collection_description', presenter: @presenter %>
             </section>
 
-            <% unless has_collection_search_parameters? %>
+            <% unless collection_search_parameters? %>
               <%= render 'show_descriptions' %>
             <% end %>
           </div>
@@ -43,9 +44,10 @@
       <% if @members_count > 0 || @presenter.subcollection_count > 0 %>
           <div class="hyc-blacklight hyc-bl-title">
             <h2>
-              <% if has_collection_search_parameters? %>
+              <% if collection_search_parameters? %>
                   <%= t('hyrax.dashboard.collections.show.search_results') %>
               <% end %>
+              <p class="sr-only"><%= t('hyrax.dashboard.collections.show.search_results') %></p>
             </h2>
           </div>
       <% end %>
@@ -63,12 +65,12 @@
       <!-- Subcollections -->
       <% if @presenter.collection_type_is_nestable? %>
         <section id="sub-collections-wrapper" class="sub-collections-wrapper">
-          <h4><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h4>
+          <h3><%= t('.subcollection_count') %> (<%= @subcollection_count %>)</h3>
           <div class="row">
             <div class="col-md-7">
               <%= render 'subcollection_list', id: @presenter.id, collection: @subcollection_docs %>
             </div>
-            <% unless has_collection_search_parameters? %>
+            <% unless collection_search_parameters? %>
               <div class="col-md-5">
                 <%= render 'show_subcollection_actions', presenter: @presenter %>
               </div>
@@ -79,8 +81,8 @@
 
       <!-- Works -->
       <section class="works-wrapper">
-        <h4><%= t('.item_count') %> (<%= @members_count %>)</h4>
-        <% unless has_collection_search_parameters? %>
+        <h3><%= t('.item_count') %> (<%= @members_count %>)</h3>
+        <% unless collection_search_parameters? %>
           <%= render 'show_add_items_actions', presenter: @presenter %>
         <% end %>
 
@@ -93,12 +95,12 @@
   </section><!-- /collections-panel-wrapper -->
 </div><!-- /collections-wrapper -->
 
-<% if @presenter.collection_type_is_nestable? && !has_collection_search_parameters? %>
+<% if @presenter.collection_type_is_nestable? && !collection_search_parameters? %>
   <%= render 'hyrax/my/collections/modal_add_to_collection', source: 'show' %>
-  <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, source: 'show' %>
+  <%= render 'hyrax/my/collections/modal_add_subcollection', id: @presenter.id, presenter: @presenter, source: 'show' %>
   <%= render 'hyrax/dashboard/collections/modal_parent_collection_remove_deny', source: 'show' %>
 <% end %>
 
-<% unless has_collection_search_parameters? %>
+<% unless collection_search_parameters? %>
   <%= render '/shared/select_work_type_modal', create_work_presenter: @presenter.create_work_presenter if @presenter.draw_select_work_modal? %>
 <% end %>
diff --git a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
index 99824ad4..ab22e1d0 100644
--- a/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_repository_content.html.erb
@@ -1,18 +1,23 @@
 <li class="h5"><%= t('hyrax.admin.sidebar.repository_objects') %></li>
- <% if can? :manage_any, AdminSet %>
-   <%= menu.nav_link(hyrax.admin_admin_sets_path) do %>
-     <span class="fa fa-sitemap"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.admin_sets') %></span>
-   <% end %>
+<% # Override Note: Change that only admins can see this stuff %>
+<% if can? :manage_any, AdminSet %>
+  <%= menu.nav_link(hyrax.admin_admin_sets_path) do %>
+  <span class="fa fa-sitemap"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.admin_sets') %></span>
+ <% end %>
+<% end %>
+<% if current_user.admin? %>
+  <%= menu.nav_link(hyrax.my_collections_path,
+                  onclick: "dontChangeAccordion(event);",
+                  also_active_for: hyrax.dashboard_collections_path) do %>
+  <span class="fa fa-folder-open"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
  <% end %>
- <% if current_user.admin? %>
-   <%= menu.nav_link(hyrax.my_collections_path,
-                     also_active_for: hyrax.dashboard_collections_path) do %>
-     <span class="fa fa-folder-open"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.collections') %></span>
-   <% end %>
 
-   <%= menu.nav_link(hyrax.my_works_path,
-                     also_active_for: hyrax.dashboard_works_path,
-                     data: { turbolinks: false }) do %>
-     <span class="fa fa-file"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
-   <% end %>
+ <%= menu.nav_link(hyrax.my_works_path,
+                  onclick: "dontChangeAccordion(event);",
+                  also_active_for: hyrax.dashboard_works_path,
+                  data: { turbolinks: false }) do %>
+  <span class="fa fa-file"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.works') %></span>
  <% end %>
+
+<%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :repository_content %>
+<% end %>
diff --git a/app/views/hyrax/dashboard/sidebar/_tasks.html.erb b/app/views/hyrax/dashboard/sidebar/_tasks.html.erb
index 08b883b7..0d6f6e3a 100644
--- a/app/views/hyrax/dashboard/sidebar/_tasks.html.erb
+++ b/app/views/hyrax/dashboard/sidebar/_tasks.html.erb
@@ -1,7 +1,8 @@
 <% if current_user.admin? %>
     <% if can? :review, :submissions %>
         <li class="h5"><%= t('hyrax.admin.sidebar.tasks') %></li>
-        <%= menu.nav_link(hyrax.admin_workflows_path) do %>
+        <%= menu.nav_link(hyrax.admin_workflows_path,
+                          onclick: "dontChangeAccordion(event);") do %>
             <span class="fa fa-flag"></span><span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.workflow_review') %></span>
         <% end %>
     <% end %>
@@ -49,8 +50,11 @@
     <% end %>
 
     <% if can? :manage, User %>
-        <%= menu.nav_link(hyrax.admin_users_path) do %>
+        <%= menu.nav_link(hyrax.admin_users_path,
+                          onclick: "dontChangeAccordion(event);") do %>
             <span class="fa fa-user"></span> <span class="sidebar-action-text"><%= t('hyrax.admin.sidebar.users') %></span>
         <% end %>
     <% end %>
 <% end %>
+
+<%= render 'hyrax/dashboard/sidebar/menu_partials', menu: menu, section: :tasks %>
diff --git a/app/views/hyrax/dashboard/works/_default_group.html.erb b/app/views/hyrax/dashboard/works/_default_group.html.erb
index a2ecd14d..650a69a9 100644
--- a/app/views/hyrax/dashboard/works/_default_group.html.erb
+++ b/app/views/hyrax/dashboard/works/_default_group.html.erb
@@ -1,3 +1,4 @@
+<fieldset>
 <table class="table table-striped works-list">
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
   <% unless params[:display_type] == 'list' %>
@@ -6,11 +7,11 @@
   <tr>
     <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
     <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
+    <th class="text-center"><%= t("hyrax.dashboard.my.heading.date_modified") %></th>
     <th><%= t("hyrax.dashboard.my.heading.highlighted") %></th>
-    <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
+    <th class="text-center"><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>
     <th>Status</th>
-    <th><%= t("hyrax.dashboard.my.heading.action") %></th>
+    <th class="text-center"><%= t("hyrax.dashboard.my.heading.action") %></th>
   </tr>
   </thead>
   <% end %>
@@ -25,3 +26,4 @@
 <script>
  Tufts.activateDataTable({selector: '.works-list', paging: false})
 </script>
+</fieldset>
\ No newline at end of file
diff --git a/app/views/hyrax/dashboard/works/_list_works.html.erb b/app/views/hyrax/dashboard/works/_list_works.html.erb
index 84c37992..38ad12f5 100644
--- a/app/views/hyrax/dashboard/works/_list_works.html.erb
+++ b/app/views/hyrax/dashboard/works/_list_works.html.erb
@@ -6,7 +6,7 @@
 
   <td>
     <div class='media'>
-      <%= link_to [main_app, document], class: 'media-left', 'aria-hidden' => true do %>
+      <%= link_to [main_app, document], class: 'media-left' do %>
         <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail' }, { suppress_link: true } %>
       <% end %>
 
@@ -28,7 +28,7 @@
     </div>
   </td>
 
-  <td class="date"><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_modified %></td>
   <td class='text-center'>
     <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>"></span></td>
   <td><%= render_visibility_link document %></td>
diff --git a/app/views/hyrax/file_sets/_show_details.html.erb b/app/views/hyrax/file_sets/_show_details.html.erb
index d919260b..4b5f1cf7 100644
--- a/app/views/hyrax/file_sets/_show_details.html.erb
+++ b/app/views/hyrax/file_sets/_show_details.html.erb
@@ -1,23 +1,23 @@
-<h2>File Details</h2>
+<h2><%= t(".file_details") %></h2>
 <dl class="dl-horizontal file-show-term file-show-details">
-  <dt>Depositor</dt>
+  <dt><%= t(".depositor") %></dt>
   <dd itemprop="accountablePerson" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><%= link_to_profile @presenter.depositor %></span></dd>
-  <dt>Date Uploaded</dt>
+  <dt><%= t(".date_uploaded") %></dt>
   <dd itemprop="datePublished"><%= @presenter.date_uploaded %></dd>
-  <dt>Date Modified</dt>
+  <dt><%= t(".date_modified") %></dt>
   <dd itemprop="dateModified"><%= @presenter.date_modified %></dd>
   <% unless @presenter.file_date_created.empty? %>
   <dt>Date Created</dt>
   <dd itemprop="dateModified"><%= @presenter.file_date_created.first %></dd>
   <% end %>
-  <dt>Fixity Check</dt>
+  <dt><%= t(".fixity_check") %></dt>
   <dd><%= @presenter.fixity_check_status %></dd>
-  <dt>Characterization</dt>
+  <dt><%= t(".characterization") %></dt>
   <dd>
     <% if @presenter.characterized? %>
       <%= render 'show_characterization_details' %>
     <% else %>
-      not yet characterized
+      <%= t(".not_yet_characterized") %>
     <% end %>
   </dd>
 </dl>
diff --git a/app/views/hyrax/homepage/index.html.erb b/app/views/hyrax/homepage/index.html.erb
index 44f86ed0..985176c4 100644
--- a/app/views/hyrax/homepage/index.html.erb
+++ b/app/views/hyrax/homepage/index.html.erb
@@ -1,3 +1,4 @@
+<% # Override Note: Todo: undestand what this overide is for, a lot of changes between 2.9 and 3.6 so leaving it alone for now %>
 <% provide :page_title, application_name %>
 
 <div class="col-sm-12">
diff --git a/app/views/hyrax/my/works/_default_group.html.erb b/app/views/hyrax/my/works/_default_group.html.erb
index 298b424a..c3d37e4c 100644
--- a/app/views/hyrax/my/works/_default_group.html.erb
+++ b/app/views/hyrax/my/works/_default_group.html.erb
@@ -1,3 +1,4 @@
+<fieldset>
 <table class="table table-striped works-list">
   <caption class="sr-only"><%= t("hyrax.dashboard.my.sr.listing") %> <%= application_name %></caption>
   <% unless params[:display_type] == 'list' %>
@@ -5,11 +6,12 @@
     <tr>
       <th class="check-all"><label for="check_all" class="sr-only"><%= t("hyrax.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
       <th><%= t("hyrax.dashboard.my.heading.title") %></th>
-      <th><%= t("hyrax.dashboard.my.heading.date_uploaded") %></th>
-      <th><%= t("hyrax.dashboard.my.heading.highlighted") %></th>
-      <th><%= t("hyrax.dashboard.my.heading.visibility") %></th>
-      <th>Status</th>
-      <th><%= t("hyrax.dashboard.my.heading.action") %></th>
+      <th class='text-center'><%= t("hyrax.dashboard.my.heading.last_modified") %></th>
+      <th class='text-center'><%= t("hyrax.dashboard.my.heading.highlighted") %></th>
+      <th class='text-center'><%= t("hyrax.dashboard.my.heading.work.visibility") %></th>
+      <% # Override Note: We added Status thread head %>
+      <th class='text-center'>Status</th>
+      <th class='text-center'><%= t("hyrax.dashboard.my.heading.action") %></th>
     </tr>
     </thead>
   <% end %>
@@ -22,3 +24,4 @@
 <script>
  Tufts.activateDataTable({selector: '.works-list', paging: false})
 </script>
+</fieldset>
diff --git a/app/views/hyrax/my/works/_list_works.html.erb b/app/views/hyrax/my/works/_list_works.html.erb
index 84c37992..dbce0ee0 100644
--- a/app/views/hyrax/my/works/_list_works.html.erb
+++ b/app/views/hyrax/my/works/_list_works.html.erb
@@ -1,13 +1,14 @@
 <tr id="document_<%= document.id %>">
+
   <td>
-    <label for="batch_document_<%= document.id %>" class="sr-only"><%=t("hyrax.dashboard.my.sr.batch_checkbox")%></label>
+    <label for="batch_document_<%= document.id %>" class="sr-only"><%= t("hyrax.dashboard.my.sr.batch_checkbox") %></label>
     <%= render 'hyrax/batch_select/add_button', document: document %>&nbsp;
   </td>
 
   <td>
     <div class='media'>
-      <%= link_to [main_app, document], class: 'media-left', 'aria-hidden' => true do %>
-        <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail' }, { suppress_link: true } %>
+      <%= link_to [main_app, document], class: 'media-left' do %>
+        <%= render_thumbnail_tag document, { class: 'hidden-xs file_listing_thumbnail', alt: "#{document.title_or_label} #{t('hyrax.homepage.admin_sets.thumbnail')}" }, { suppress_link: true } %>
       <% end %>
 
       <div class='media-body'>
@@ -27,14 +28,13 @@
       </div>
     </div>
   </td>
-
-  <td class="date"><%= document.date_uploaded %></td>
+  <td class="date text-center"><%= document.date_modified %></td>
   <td class='text-center'>
+    <% # Override Note: Removed aria-hidden %>
     <span class="fa <%= current_user.trophies.where(work_id: document.id).exists? ? 'fa-star highlighted-work' : 'fa-star-o trophy-off' %>"></span></td>
-  <td><%= render_visibility_link document %></td>
+  <td class='text-center'><%= render_visibility_link document %></td>
 
-  <td class='workflow-state'><%= render 'tufts/workflow_status_badge', locals: {id: document.id} %></td>
-  <td>
+  <td class='text-center'>
     <%= render 'work_action_menu', document: document %>
   </td>
 </tr>
diff --git a/app/views/hyrax/my/works/_tabs.html.erb b/app/views/hyrax/my/works/_tabs.html.erb
index a8bafd5a..65719efe 100644
--- a/app/views/hyrax/my/works/_tabs.html.erb
+++ b/app/views/hyrax/my/works/_tabs.html.erb
@@ -1,3 +1,4 @@
+<% # Override Note: Todo re-review I think I should delete this file %>
 <ul class="nav nav-tabs" id="my_nav" role="navigation">
   <span class="sr-only">You are currently listing your works.  You have <%= @response.docs.count %> <%= 'work'.pluralize(@response.docs.count)%> </span>
   <li<%= ' class="active"'.html_safe if current_page?(hyrax.dashboard_works_path(locale: nil)) %>>
diff --git a/app/views/hyrax/uploads/_js_templates.html.erb b/app/views/hyrax/uploads/_js_templates.html.erb
index 45b69db8..79bdfd3c 100644
--- a/app/views/hyrax/uploads/_js_templates.html.erb
+++ b/app/views/hyrax/uploads/_js_templates.html.erb
@@ -1,3 +1,4 @@
+<% # Override Note: Todo: undestand what this overide is for, a small changes between 2.9 and 3.6 so leaving it alone for now %>
 <!-- The template to display files available for upload -->
 <% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %>
 <script id="template-upload" type="text/x-tmpl">
diff --git a/build/install_gems.sh b/build/install_gems.sh
index ac98d3ef..90da2e69 100755
--- a/build/install_gems.sh
+++ b/build/install_gems.sh
@@ -6,3 +6,5 @@ if [ "${RAILS_ENV}" = 'production' ] || [ "${RAILS_ENV}" = 'staging' ]; then
 else
   bundle install --without production
 fi
+
+bundle update tufts-curation
diff --git a/config/initializers/hyrax.rb b/config/initializers/hyrax.rb
index 8ebfc4ca..92e5ace5 100644
--- a/config/initializers/hyrax.rb
+++ b/config/initializers/hyrax.rb
@@ -16,6 +16,12 @@
   # @see Hyrax::Configuration for additional details and defaults.
   config.default_active_workflow_name = 'mira_publication_workflow'
 
+  # TODO: this is apart of the issue with with creating the base data for tests
+  # Which RDF term should be used to relate objects to an admin set?
+  # If this is a new repository, you may want to set a custom predicate term here to
+  # avoid clashes if you plan to use the default (dct:isPartOf) for other relations.
+  config.admin_set_predicate = "admin_set_member"
+
   # Email recipient of messages sent via the contact form
   # config.contact_email = "repo-admin@example.org"
 
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
index acb19bb5..c21f8ce5 100644
--- a/config/initializers/redis.rb
+++ b/config/initializers/redis.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
 r_file = Rails.root.join('config', 'redis.yml').to_s
 r_config = YAML.safe_load(File.open(r_file)).deep_symbolize_keys![Rails.env.to_sym]
+# TODO: this is depricated figure out replacement
+# Dropped support for this in hryax 5
 Redis.current = Redis.new(r_config.merge(thread_safe: true))
diff --git a/docker-compose.yml b/docker-compose.yml
index 81926da2..27440725 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -69,7 +69,8 @@ services:
     <<: *dev
     command: >
       bash -c "./build/entrypoint.sh &&
-      bundle exec rails s -p 3000 -b '0.0.0.0'"
+      tail -f /dev/null
+      # bundle exec rails s -p 3000 -b '0.0.0.0'"
     ports:
       - "${SERVER_PORTS}"
     expose:
@@ -123,7 +124,8 @@ services:
       - bundled:/usr/local/bundle
     command: >
       bash -c "./build/entrypoint.sh &&
-      RAILS_ENV=test bundle exec rails s -p 3001 -b '0.0.0.0'"
+      tail -f /dev/null
+      # RAILS_ENV=test bundle exec rails s -p 3001 -b '0.0.0.0'"
  #     puma -b tcp://0.0.0.0:3001 -e test"
     ports:
       - "${TEST_PORTS}"
diff --git a/spec/features/publication_workflow_spec.rb b/spec/features/publication_workflow_spec.rb
index d96bffd7..965c6d6e 100644
--- a/spec/features/publication_workflow_spec.rb
+++ b/spec/features/publication_workflow_spec.rb
@@ -82,7 +82,7 @@
 
       # The admin user comments on the work
       subject = Hyrax::WorkflowActionInfo.new(work, publishing_user)
-      sipity_workflow_action = PowerConverter.convert_to_sipity_action("comment_only", scope: subject.entity.workflow) { nil }
+      sipity_workflow_action = Sipity::WorkflowAction("comment_only", subject.entity.workflow) { nil }
       Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: "This is a comment")
       expect(work.to_sipity_entity.reload.workflow_state_name).to eq "published"
 
diff --git a/spec/lib/tufts/workflow_status_spec.rb b/spec/lib/tufts/workflow_status_spec.rb
index 6a12c081..5f022fd1 100644
--- a/spec/lib/tufts/workflow_status_spec.rb
+++ b/spec/lib/tufts/workflow_status_spec.rb
@@ -17,14 +17,14 @@
 
   it 'returns published for an published work when given its ID' do
     subject = Hyrax::WorkflowActionInfo.new(work, current_user)
-    sipity_workflow_action = PowerConverter.convert_to_sipity_action("publish", scope: subject.entity.workflow) { nil }
+    sipity_workflow_action = Sipity::WorkflowAction("publish", subject.entity.workflow) { nil }
     Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: "Published by #{current_user}")
     expect(workflow_status.status(work.id)).to eq('published')
   end
 
   it 'returns edited for an published work that has a draft when given its ID' do # rubocop:disable RSpec/ExampleLength
     subject = Hyrax::WorkflowActionInfo.new(work, current_user)
-    sipity_workflow_action = PowerConverter.convert_to_sipity_action("publish", scope: subject.entity.workflow) { nil }
+    sipity_workflow_action = Sipity::WorkflowAction("publish", subject.entity.workflow) { nil }
     Hyrax::Workflow::WorkflowActionService.run(subject: subject, action: sipity_workflow_action, comment: "Published by #{current_user}")
     File.open(Rails.application.config.drafts_storage_dir.join(work.id), 'w+')
     expect(workflow_status.status(work.id)).to eq('edited')