diff --git a/Gemfile b/Gemfile
index e9946bd4..06c68728 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,7 +74,7 @@ group :deployment do
 end
 
 gem 'blacklight', '~> 7.14'
-gem 'blacklight-spotlight', '~> 3.1'
+gem 'blacklight-spotlight', '~> 3.1', github: 'projectblacklight/spotlight', branch: 'nestable'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 
 gem 'friendly_id'
@@ -111,3 +111,5 @@ gem 'cache_with_locale'
 
 gem 'i18n-js', '< 4' # v4 was a complete rewrite; will take some work to update
 gem 'i18n-tasks'
+
+gem 'importmap-rails', '~> 1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 08d2b80c..25770a48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,48 @@
+GIT
+  remote: https://github.com/projectblacklight/spotlight.git
+  revision: 3175f09046db7da5217c316e1e9644bf5e3353fc
+  branch: nestable
+  specs:
+    blacklight-spotlight (3.5.0.2)
+      activejob-status
+      acts-as-taggable-on (>= 5.0, < 10)
+      autoprefixer-rails
+      blacklight (>= 7.18, < 9)
+      blacklight-gallery (>= 3.0, < 5)
+      bootstrap_form (~> 4.1)
+      breadcrumbs_on_rails (>= 3.0, < 5)
+      cancancan
+      carrierwave (~> 2.2)
+      clipboard-rails (~> 1.5)
+      devise (~> 4.1)
+      devise_invitable
+      faraday
+      faraday-follow_redirects
+      friendly_id (~> 5.5)
+      github-markup
+      handlebars_assets
+      i18n
+      i18n-active_record
+      iiif-presentation
+      iiif_manifest
+      leaflet-rails
+      legato
+      mini_magick
+      nokogiri
+      oauth2
+      openseadragon
+      ostruct (!= 0.3.2, != 0.3.1, != 0.3.0)
+      paper_trail (>= 11.0, < 13)
+      rails (>= 6.1, < 8)
+      redcarpet (>= 2.0.1, < 4)
+      riiif (~> 2.0)
+      roar (~> 1.1)
+      roar-rails
+      signet
+      sprockets (>= 4)
+      tophat
+      view_component (~> 2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -94,10 +139,6 @@ GEM
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
     bcrypt (3.1.18)
     better_html (2.0.1)
       actionview (>= 6.0)
@@ -128,47 +169,6 @@ GEM
       blacklight (>= 7.0, < 9)
       rails
       ruby-oembed
-    blacklight-spotlight (3.5.0.2)
-      activejob-status
-      acts-as-taggable-on (>= 5.0, < 10)
-      autoprefixer-rails
-      blacklight (~> 7.18)
-      blacklight-gallery (>= 3.0, < 5)
-      bootstrap_form (~> 4.1)
-      breadcrumbs_on_rails (>= 3.0, < 5)
-      cancancan
-      carrierwave (~> 2.2)
-      clipboard-rails (~> 1.5)
-      devise (~> 4.1)
-      devise_invitable
-      faraday
-      faraday_middleware
-      friendly_id (~> 5.2, != 5.4.1, != 5.4.0)
-      github-markup
-      handlebars_assets
-      i18n
-      i18n-active_record
-      iiif-presentation
-      iiif_manifest
-      leaflet-rails
-      legato
-      mini_magick
-      nokogiri
-      oauth2
-      openseadragon
-      ostruct (!= 0.3.2, != 0.3.1, != 0.3.0)
-      paper_trail (>= 11.0, < 13)
-      rails (>= 6.1, < 8)
-      redcarpet (>= 2.0.1, < 4)
-      riiif (~> 2.0)
-      roar (~> 1.1)
-      roar-rails
-      signet
-      sprockets (>= 3)
-      sprockets-es6
-      thor
-      tophat
-      underscore-rails (~> 1.6)
     blacklight_range_limit (8.2.3)
       blacklight (>= 7.25.2, < 9)
     bootsnap (1.16.0)
@@ -305,31 +305,12 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (1.10.3)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    faraday_middleware (1.2.0)
-      faraday (~> 1.0)
+    faraday-follow_redirects (0.3.0)
+      faraday (>= 1, < 3)
+    faraday-net_http (3.0.2)
     ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -380,11 +361,14 @@ GEM
       activesupport (>= 3.2.18)
       faraday (>= 0.9)
       json
-    iiif_manifest (1.3.0)
+    iiif_manifest (1.3.1)
       activesupport (>= 4)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    importmap-rails (1.1.5)
+      actionpack (>= 6.0.0)
+      railties (>= 6.0.0)
     io-console (0.6.0)
     irb (1.6.2)
       reline (>= 0.3.0)
@@ -440,7 +424,6 @@ GEM
     msgpack (1.6.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.3.0)
     net-imap (0.3.4)
       date
       net-protocol
@@ -667,10 +650,6 @@ GEM
     sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-es6 (0.9.2)
-      babel-source (>= 5.8.11)
-      babel-transpiler
-      sprockets (>= 3.0.0)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -704,7 +683,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    underscore-rails (1.8.3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
@@ -744,7 +722,7 @@ DEPENDENCIES
   blacklight-gallery (~> 4.0)
   blacklight-hierarchy
   blacklight-oembed (>= 0.1.0)
-  blacklight-spotlight (~> 3.1)
+  blacklight-spotlight (~> 3.1)!
   blacklight_range_limit (~> 8.0)
   bootsnap (>= 1.4.4)
   bootstrap (~> 4.0)
@@ -767,6 +745,7 @@ DEPENDENCIES
   i18n-js (< 4)
   i18n-tasks
   iiif-presentation (~> 1.0)
+  importmap-rails (~> 1.1)
   jbuilder (~> 2.7)
   jquery-rails
   lograge
diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
index cb4ddbfc..866996be 100644
--- a/app/assets/config/manifest.js
+++ b/app/assets/config/manifest.js
@@ -1,3 +1,10 @@
 //= link_tree ../images
-//= link_directory ../javascripts .js
 //= link application.css
+//= link spotlight/manifest.js
+//= link_tree ../../javascript .js
+//= link_tree ../../../vendor/javascript .js
+
+// needed for import map pin_all_under
+//= link spotlight/application.js
+//= link spotlight/spotlight.esm.js
+//= link spotlight/spotlight.js
\ No newline at end of file
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
deleted file mode 100644
index a1e0dd83..00000000
--- a/app/assets/javascripts/application.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
-// vendor/assets/javascripts directory can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file. JavaScript code in this file should be added after the last require_* statement.
-//
-// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require rails-ujs
-//= require turbolinks
-//
-//
-// Required by Blacklight
-//= require jquery3
-//= require popper
-//= require twitter/typeahead
-//= require bootstrap
-//= require bootstrap/util
-//= require blacklight/blacklight
-
-//= require transform_result
-//= require i18n/translations
-//= require_tree .
-
-
-// For blacklight_range_limit built-in JS, if you don't want it you don't need
-// this:
-//= require 'blacklight_range_limit'
diff --git a/app/javascript/application.js b/app/javascript/application.js
new file mode 100644
index 00000000..17fa9b57
--- /dev/null
+++ b/app/javascript/application.js
@@ -0,0 +1,45 @@
+// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
+import jQuery from 'jquery'
+window.jQuery = jQuery
+window.$ = jQuery
+
+console.log("JQURY imported")
+import 'bootstrap'
+import "@hotwired/turbo-rails"
+import L from 'leaflet'
+window.L = L
+import SirTrevor from 'sir-trevor'
+window.SirTrevor = SirTrevor
+import Clipboard from 'clipboard'
+window.Clipboard = Clipboard
+
+// We can probably ditch this dynamic import once we use Blacklight 8
+import('blacklight/blacklight')
+import('spotlight/spotlight.esm').then((Spotlight)=> { 
+  console.log('spotlight defined')
+  window.Spotlight = Spotlight
+})
+
+import {I18n} from 'i18n-js'
+window.I18n = I18n
+
+//= require rails-ujs
+//= require turbolinks
+//
+//
+// Required by Blacklight
+//= require jquery3
+//= require popper
+//= require twitter/typeahead
+//= require bootstrap
+//= require bootstrap/util
+//= require blacklight/blacklight
+
+//= require transform_result
+//= require i18n/translations
+// require_tree .
+
+
+// For blacklight_range_limit built-in JS, if you don't want it you don't need
+// this:
+//= require 'blacklight_range_limit'
\ No newline at end of file
diff --git a/app/views/layouts/spotlight/base.html.erb b/app/views/layouts/spotlight/base.html.erb
new file mode 100644
index 00000000..1103a7a9
--- /dev/null
+++ b/app/views/layouts/spotlight/base.html.erb
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<%= content_tag :html, class: 'no-js', **(try(:html_tag_attributes) || {}) do %>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <%= render partial: 'shared/analytics' %>
+    <title><%= h(@page_title || application_name.to_s) %></title>
+    <link href="<%= current_exhibit ? spotlight.opensearch_exhibit_catalog_url(current_exhibit, format: 'xml') : main_app.opensearch_catalog_url(format: 'xml') %>" title="<%= h(@page_title || application_name.to_str) %>" type="application/opensearchdescription+xml" rel="search"/>
+    <%= favicon_link_tag 'favicon.ico' %>
+    <% if current_exhibit %>
+      <%= exhibit_stylesheet_link_tag "application" %>
+    <% else %>
+      <%= stylesheet_link_tag "application" %>
+    <% end %>
+    
+    <%#= javascript_include_tag "application" %>
+    <%= javascript_importmap_tags %>
+    <%= csrf_meta_tags %>
+    <%= content_for(:head) %>
+    <%= description %>
+    <%= twitter_card %>
+    <%= opengraph %>
+    <%= javascript_tag "window.addEventListener('load', () => Spotlight.sirTrevorIcon = '#{asset_path('spotlight/blocks/sir-trevor-icons.svg')}')" %>
+    <%= javascript_tag '$.fx.off = true;' if Rails.env.test? %>
+  </head>
+  <body class="<%= render_body_class %>">
+    <%= render partial: 'shared/body_preamble' %>
+    <div id="skip-link">
+      <% if should_render_spotlight_search_bar? %>
+        <%= link_to t('blacklight.skip_links.search_field'), '#search_field', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <% end %>
+      <%= link_to t('blacklight.skip_links.main_content'), '#main-container', class: 'element-invisible element-focusable rounded-bottom py-2 px-3', data: { turbolinks: 'false' } %>
+      <%= content_for(:skip_links) %>
+    </div>
+
+    <%= render partial: 'shared/header_navbar' %>
+    <%= render partial: 'shared/masthead' %>
+    <%= content_for?(:header_content) ? yield(:header_content) : "" %>
+
+    <main id="main-container" class="<%= container_classes %>" role="main" aria-label="<%= t('blacklight.main.aria.main_container') %>">
+      <%= content_for(:container_header) %>
+
+      <%= render partial: 'shared/flash_msg', layout: 'shared/flash_messages' %>
+
+      <div class="row">
+        <%= content_for?(:content) ? yield(:content) : yield %>
+      </div>
+    </main>
+
+    <%= render partial: 'shared/footer' %>
+    <%= render partial: 'shared/modal' %>
+  </body>
+<% end %>
diff --git a/app/views/shared/_i18n_js.html.erb b/app/views/shared/_i18n_js.html.erb
index 713bc699..1640a52a 100644
--- a/app/views/shared/_i18n_js.html.erb
+++ b/app/views/shared/_i18n_js.html.erb
@@ -1,4 +1,7 @@
 <%= javascript_tag do %>
-  I18n.defaultLocale = "<%= I18n.default_locale %>";
-  I18n.locale = "<%= I18n.locale %>";
+  window.addEventListener('load', () => {
+  console.log("SPOT", window.Spotlight)
+    I18n.defaultLocale = "<%= I18n.default_locale %>";
+    I18n.locale = "<%= I18n.locale %>";
+  })
 <% end %>
diff --git a/bin/importmap b/bin/importmap
new file mode 100755
index 00000000..36502ab1
--- /dev/null
+++ b/bin/importmap
@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require_relative "../config/application"
+require "importmap/commands"
diff --git a/config/importmap.rb b/config/importmap.rb
new file mode 100644
index 00000000..09c578ad
--- /dev/null
+++ b/config/importmap.rb
@@ -0,0 +1,19 @@
+# Pin npm packages by running ./bin/importmap
+
+pin "application", preload: true
+pin "jquery", to: "https://ga.jspm.io/npm:jquery@3.6.3/dist/jquery.js", preload: true
+pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@4.6.2/dist/js/bootstrap.js"
+pin "popper.js", to: "https://ga.jspm.io/npm:popper.js@1.16.1/dist/umd/popper.js"
+pin "@hotwired/turbo-rails", to: "https://ga.jspm.io/npm:@hotwired/turbo-rails@7.2.5/app/javascript/turbo/index.js"
+pin "@hotwired/turbo", to: "https://ga.jspm.io/npm:@hotwired/turbo@7.2.5/dist/turbo.es2017-esm.js"
+pin "@rails/actioncable/src", to: "https://ga.jspm.io/npm:@rails/actioncable@7.0.4/src/index.js"
+pin "leaflet", to: "https://ga.jspm.io/npm:leaflet@1.9.3/dist/leaflet-src.js"
+pin_all_from Blacklight::Engine.root.join('app/assets/javascripts/blacklight/'), under: 'blacklight'
+pin_all_from Spotlight::Engine.root.join('app/assets/javascripts/spotlight/'), under: 'spotlight'
+pin "sir-trevor", to: "https://ga.jspm.io/npm:sir-trevor@0.8.2/build/sir-trevor.js"
+pin "clipboard", to: "https://ga.jspm.io/npm:clipboard@1.7.1/lib/clipboard.js"
+pin "delegate", to: "https://ga.jspm.io/npm:delegate@3.2.0/src/delegate.js"
+pin "good-listener", to: "https://ga.jspm.io/npm:good-listener@1.2.2/src/listen.js"
+pin "select", to: "https://ga.jspm.io/npm:select@1.1.2/src/select.js"
+pin "tiny-emitter", to: "https://ga.jspm.io/npm:tiny-emitter@2.1.0/index.js"
+pin "i18n-js", to: "https://ga.jspm.io/npm:i18n-js@3.9.2/app/assets/javascripts/i18n.js"
diff --git a/package.json b/package.json
index e3f1a683..7749f473 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "@blueprintjs/core": "^4.13.0",
     "@blueprintjs/icons": "^4.11.0",
     "babel-loader": "8",
+    "blacklight-frontend": "^7",
     "browser": "^0.2.6",
     "compression-webpack-plugin": "9",
     "mirador": "^3.3.0",
diff --git a/vendor/javascript/.keep b/vendor/javascript/.keep
new file mode 100644
index 00000000..e69de29b
diff --git a/yarn.lock b/yarn.lock
index 126d5389..f3f03c0f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1680,6 +1680,15 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+blacklight-frontend@^7:
+  version "7.33.1"
+  resolved "https://registry.yarnpkg.com/blacklight-frontend/-/blacklight-frontend-7.33.1.tgz#fd1728f7635b2fccd9be8623d56432f576abcc30"
+  integrity sha512-lYEg5Rr9QfcBwMdyAhnr8yFx86mSPp77oSRB4DpgXWyk4njfAhllkWNQOqodfk0IRMqsOBV0odTAYOcjUXNOFg==
+  dependencies:
+    bootstrap ">=4.3.1 <6.0.0"
+    jquery "^3.5.1"
+    typeahead.js "^0.11.1"
+
 body-parser@1.20.1:
   version "1.20.1"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
@@ -1713,6 +1722,11 @@ boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
+"bootstrap@>=4.3.1 <6.0.0":
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz#54739f4414de121b9785c5da3c87b37ff008322b"
+  integrity sha512-cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ==
+
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2931,6 +2945,11 @@ jest-worker@^27.4.5:
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
+jquery@>=1.7, jquery@^3.5.1:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
+  integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4453,6 +4472,13 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typeahead.js@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/typeahead.js/-/typeahead.js-0.11.1.tgz#4e64e671b22310a8606f4aec805924ba84b015b8"
+  integrity sha512-yGaLzGjVHyryZdNfrWz2NHXUwEO7hrlVmGMGCo5+6mH3nEEhcQ0Te3mK3G60uRnxfERu8twOWSU4WmwScbwhMg==
+  dependencies:
+    jquery ">=1.7"
+
 typed-styles@^0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9"