diff --git a/.gitignore b/.gitignore
index bc58bf4..4f9dc78 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,7 @@ __pycache__
 .direnv
 /db.sqlite3
 /venv
+.idea/workspace.xml
+.idea/misc.xml
+.idea/scavenger.iml
+```
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index aed4b13..4daa519 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -2,7 +2,12 @@
 <project version="4">
   <component name="dataSourceStorageLocal" created-in="PY-232.10227.11">
     <data-source name="db.sqlite3" uuid="bfb4a50e-a5ff-44b4-9197-735fab07a7d7">
-      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="SQLITE" exact-version="0" />
+      <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="SQLITE" exact-version="0">
+        <identifier-quote-string>&quot;</identifier-quote-string>
+      </database-info>
+      <case-sensitivity plain-identifiers="mixed" quoted-identifiers="mixed" />
+      <secret-storage>master_key</secret-storage>
+      <auth-provider>no-auth</auth-provider>
       <schema-mapping />
     </data-source>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index b1ea2f1..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Black">
-    <option name="sdkName" value="Python 3.10" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (venv) (3)" project-jdk-type="Python SDK" />
-</project>
diff --git a/.idea/runConfigurations/Scavenger_.xml b/.idea/runConfigurations/Scavenger_.xml
deleted file mode 100644
index 8271c20..0000000
--- a/.idea/runConfigurations/Scavenger_.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Scavenger " type="Python.DjangoServer" factoryName="Django server">
-    <module name="scavenger" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="DJANGO_SETTINGS_MODULE" value="wlmac-scavenger.settings" />
-    </envs>
-    <option name="SDK_HOME" value="C:\Users\jason\AppData\Local\Programs\Python\Python310\python.exe" />
-    <option name="SDK_NAME" value="Python 3.10" />
-    <option name="WORKING_DIRECTORY" value="" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <option name="launchJavascriptDebuger" value="false" />
-    <option name="port" value="8000" />
-    <option name="host" value="" />
-    <option name="additionalOptions" value="" />
-    <option name="browserUrl" value="" />
-    <option name="runTestServer" value="false" />
-    <option name="runNoReload" value="false" />
-    <option name="useCustomRunCommand" value="true" />
-    <option name="customRunCommand" value="poetry run python manage.py runserver" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.idea/scavenger.iml b/.idea/scavenger.iml
index dbb060e..7a335b4 100644
--- a/.idea/scavenger.iml
+++ b/.idea/scavenger.iml
@@ -22,7 +22,7 @@
     <option name="myDocStringFormat" value="Plain" />
   </component>
   <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
+    <option name="TEMPLATE_CONFIGURATION" value="Django" />
     <option name="TEMPLATE_FOLDERS">
       <list>
         <option value="$MODULE_DIR$/core/templates" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 97adc6f..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,457 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="307a4b14-2203-4e9e-9b96-a5d1f2c938d0" name="Changes" comment="&#10;Updated timezone and removed the configs in settings.py in favor of Hunt settings &#10;&#10;Fixed team logic for Hunts &#10;&#10;&#10;renamed a field">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/admin.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/admin.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/locale/ja_JP/LC_MESSAGES/django.po" beforeDir="false" afterPath="$PROJECT_DIR$/core/locale/ja_JP/LC_MESSAGES/django.po" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/models.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/core/views/team.py" beforeDir="false" afterPath="$PROJECT_DIR$/core/views/team.py" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DjangoConsoleOptions" custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)">
-    <option name="myCustomStartScript" value="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="grazie_rule" />
-        <option value="Python Script" />
-      </list>
-    </option>
-  </component>
-  <component name="FlaskConsoleOptions" custom-start-script="import sys&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;from flask.cli import ScriptInfo&#10;locals().update(ScriptInfo(create_app=None).load_app().make_shell_context())&#10;print(&quot;Python %s on %s\nApp: %s [%s]\nInstance: %s&quot; % (sys.version, sys.platform, app.import_name, app.env, app.instance_path))">
-    <envs>
-      <env key="FLASK_APP" value="app" />
-    </envs>
-    <option name="myCustomStartScript" value="import sys&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;from flask.cli import ScriptInfo&#10;locals().update(ScriptInfo(create_app=None).load_app().make_shell_context())&#10;print(&quot;Python %s on %s\nApp: %s [%s]\nInstance: %s&quot; % (sys.version, sys.platform, app.import_name, app.env, app.instance_path))" />
-    <option name="myEnvs">
-      <map>
-        <entry key="FLASK_APP" value="app" />
-      </map>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="main" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="UPDATE_TYPE" value="REBASE" />
-  </component>
-  <component name="GitToolBoxStore">
-    <option name="projectConfigVersion" value="5" />
-    <option name="recentBranches">
-      <RecentBranches>
-        <option name="branchesForRepo">
-          <list>
-            <RecentBranchesForRepo>
-              <option name="branches">
-                <list>
-                  <RecentBranch>
-                    <option name="branchName" value="temp" />
-                    <option name="lastUsedInstant" value="1701554290" />
-                  </RecentBranch>
-                  <RecentBranch>
-                    <option name="branchName" value="main" />
-                    <option name="lastUsedInstant" value="1701469634" />
-                  </RecentBranch>
-                </list>
-              </option>
-              <option name="repositoryRootUrl" value="file://$PROJECT_DIR$" />
-            </RecentBranchesForRepo>
-          </list>
-        </option>
-      </RecentBranches>
-    </option>
-  </component>
-  <component name="LogFilters">
-    <option name="FILTER_ERRORS" value="false" />
-    <option name="FILTER_WARNINGS" value="false" />
-    <option name="FILTER_INFO" value="true" />
-    <option name="FILTER_DEBUG" value="true" />
-    <option name="CUSTOM_FILTER" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 8
-}</component>
-  <component name="ProjectId" id="2YlpIlll8xF974s49vn3mZTS0sh" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;NIXITCH_NIXPKGS_CONFIG&quot;: &quot;&quot;,
-    &quot;NIXITCH_NIX_CONF_DIR&quot;: &quot;&quot;,
-    &quot;NIXITCH_NIX_OTHER_STORES&quot;: &quot;&quot;,
-    &quot;NIXITCH_NIX_PATH&quot;: &quot;&quot;,
-    &quot;NIXITCH_NIX_PROFILES&quot;: &quot;&quot;,
-    &quot;NIXITCH_NIX_REMOTE&quot;: &quot;&quot;,
-    &quot;NIXITCH_NIX_USER_PROFILE_DIR&quot;: &quot;&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowFactoryState&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.mappings&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.highlight.symlinks&quot;: &quot;true&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.date&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.permissions&quot;: &quot;false&quot;,
-    &quot;WebServerToolWindowPanel.toolwindow.show.size&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;C:/Users/jason/projects/metro/venv&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;Errors&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;C:\\Users\\jason\\AppData\\Local\\Programs\\PyCharm Professional\\plugins\\javascript-impl\\jsLanguageServicesImpl\\external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="C:\Users\jason\projects\metro\scavenger" />
-    </key>
-  </component>
-  <component name="RunManager" selected="Makefile Target.requirements.txt">
-    <configuration name="requirements.txt" type="MAKEFILE_TARGET_RUN_CONFIGURATION" factoryName="Makefile" temporary="true">
-      <makefile filename="$PROJECT_DIR$/wlmac-scavenger/Makefile" target="requirements.txt" workingDirectory="" arguments="">
-        <envs />
-      </makefile>
-      <method v="2" />
-    </configuration>
-    <configuration name="Scavenger" type="PythonConfigurationType" factoryName="Python">
-      <module name="scavenger" />
-      <option name="INTERPRETER_OPTIONS" value="" />
-      <option name="PARENT_ENVS" value="true" />
-      <envs>
-        <env name="PYTHONUNBUFFERED" value="1" />
-      </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="C:\Users\jason\projects\metro\scavenger\wlmac-scavenger" />
-      <option name="IS_MODULE_SDK" value="false" />
-      <option name="ADD_CONTENT_ROOTS" value="true" />
-      <option name="ADD_SOURCE_ROOTS" value="true" />
-      <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="" />
-      <option name="PARAMETERS" value="poetry run python manage.py runserver" />
-      <option name="SHOW_COMMAND_LINE" value="false" />
-      <option name="EMULATE_TERMINAL" value="false" />
-      <option name="MODULE_MODE" value="true" />
-      <option name="REDIRECT_INPUT" value="false" />
-      <option name="INPUT_FILE" value="" />
-      <method v="2" />
-    </configuration>
-    <list>
-      <item itemvalue="Django Server.Scavenger " />
-      <item itemvalue="Makefile Target.requirements.txt" />
-      <item itemvalue="Python.Scavenger" />
-    </list>
-    <recent_temporary>
-      <list>
-        <item itemvalue="Makefile Target.requirements.txt" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="307a4b14-2203-4e9e-9b96-a5d1f2c938d0" name="Changes" comment="" />
-      <created>1701109954551</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1701109954551</updated>
-      <workItem from="1701109961368" duration="4885000" />
-      <workItem from="1701134001243" duration="12667000" />
-      <workItem from="1701397449296" duration="6195000" />
-      <workItem from="1701461869442" duration="7469000" />
-      <workItem from="1701478000925" duration="3622000" />
-      <workItem from="1701495617822" duration="7468000" />
-      <workItem from="1701544026526" duration="65000" />
-      <workItem from="1701544199636" duration="140000" />
-      <workItem from="1701544416171" duration="440000" />
-    </task>
-    <task id="LOCAL-00001" summary="renamed project to wlmac-scavenger">
-      <option name="closed" value="true" />
-      <created>1701111178665</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1701111178665</updated>
-    </task>
-    <task id="LOCAL-00002" summary="added .idea files because I can.">
-      <option name="closed" value="true" />
-      <created>1701111257320</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1701111257320</updated>
-    </task>
-    <task id="LOCAL-00003" summary="format">
-      <option name="closed" value="true" />
-      <created>1701111324374</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1701111324374</updated>
-    </task>
-    <task id="LOCAL-00004" summary="chore: updated reqs">
-      <option name="closed" value="true" />
-      <created>1701122326646</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1701122326646</updated>
-    </task>
-    <task id="LOCAL-00005" summary="chore: updated workflows">
-      <option name="closed" value="true" />
-      <created>1701123022638</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1701123022638</updated>
-    </task>
-    <task id="LOCAL-00006" summary="FIX: nix conf?">
-      <option name="closed" value="true" />
-      <created>1701123589043</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1701123589043</updated>
-    </task>
-    <task id="LOCAL-00007" summary="temp fix: disable identify verification">
-      <option name="closed" value="true" />
-      <created>1701403928971</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1701403928971</updated>
-    </task>
-    <task id="LOCAL-00008" summary="updated reqs">
-      <option name="closed" value="true" />
-      <created>1701462441770</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1701462441770</updated>
-    </task>
-    <task id="LOCAL-00009" summary="chore: moved all django elements up one level&#10;&#10;merged .gitignores">
-      <option name="closed" value="true" />
-      <created>1701466754271</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1701466754271</updated>
-    </task>
-    <task id="LOCAL-00010" summary="fix: updated path for nix GHA">
-      <option name="closed" value="true" />
-      <created>1701469882361</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1701469882361</updated>
-    </task>
-    <task id="LOCAL-00011" summary="missed this">
-      <option name="closed" value="true" />
-      <created>1701470030240</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1701470030240</updated>
-    </task>
-    <task id="LOCAL-00012" summary="test gpg signing">
-      <option name="closed" value="true" />
-      <created>1701470524658</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1701470524658</updated>
-    </task>
-    <task id="LOCAL-00013" summary="fix: .save being  placed in the wrong model&#10;&#10;feat: auto-create groups">
-      <option name="closed" value="true" />
-      <created>1701480283198</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1701480283198</updated>
-    </task>
-    <task id="LOCAL-00014" summary="Updated group name. &#10;&#10;changed some styling &#10;&#10;updated some docs.">
-      <option name="closed" value="true" />
-      <created>1701540841562</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1701540841563</updated>
-    </task>
-    <task id="LOCAL-00015" summary="updated lock.">
-      <option name="closed" value="true" />
-      <created>1701554376823</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1701554376823</updated>
-    </task>
-    <task id="LOCAL-00016" summary="simplified form logic &#10;hehe :D (updated default team name &#10;&#10;added a current_hunt classmethod to Hunt">
-      <option name="closed" value="true" />
-      <created>1701555513478</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1701555513478</updated>
-    </task>
-    <task id="LOCAL-00017" summary="removed duplicate .save()&#10;&#10;(create already saves it)">
-      <option name="closed" value="true" />
-      <created>1701555773047</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1701555773047</updated>
-    </task>
-    <task id="LOCAL-00018" summary="fixed order of operations for team.save">
-      <option name="closed" value="true" />
-      <created>1701555945329</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1701555945329</updated>
-    </task>
-    <task id="LOCAL-00019" summary="Limit to one event at a time">
-      <option name="closed" value="true" />
-      <created>1701556767105</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1701556767105</updated>
-    </task>
-    <task id="LOCAL-00020" summary="added django-impersonate">
-      <option name="closed" value="true" />
-      <created>1701558361459</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1701558361459</updated>
-    </task>
-    <task id="LOCAL-00021" summary="added &quot;new_event&quot; command to save teams then nuke em.">
-      <option name="closed" value="true" />
-      <created>1701562355578</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1701562355578</updated>
-    </task>
-    <task id="LOCAL-00022" summary="format.">
-      <option name="closed" value="true" />
-      <created>1701563092633</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1701563092633</updated>
-    </task>
-    <task id="LOCAL-00023" summary="im foolish but I want to commit for the future">
-      <option name="closed" value="true" />
-      <created>1701569251853</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1701569251854</updated>
-    </task>
-    <task id="LOCAL-00024" summary="feat: added members to team admin">
-      <option name="closed" value="true" />
-      <created>1701570659162</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1701570659163</updated>
-    </task>
-    <task id="LOCAL-00025" summary="&#10;Updated timezone and removed the configs in settings.py in favor of Hunt settings &#10;&#10;Fixed team logic for Hunts &#10;&#10;&#10;renamed a field">
-      <option name="closed" value="true" />
-      <created>1701570821725</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1701570821725</updated>
-    </task>
-    <option name="localTasksCounter" value="26" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="UpdateCopyrightCheckinHandler">
-    <option name="UPDATE_COPYRIGHT" value="true" />
-  </component>
-  <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ID_ORDER">
-      <list>
-        <option value="Default.Root" />
-        <option value="Default.Author" />
-        <option value="Default.Date" />
-        <option value="Default.Subject" />
-        <option value="Space.CommitStatus" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="added .idea files because I can." />
-    <MESSAGE value="format" />
-    <MESSAGE value="chore: updated reqs" />
-    <MESSAGE value="chore: updated workflows" />
-    <MESSAGE value="FIX: nix conf?" />
-    <MESSAGE value="temp fix: disable identify verification" />
-    <MESSAGE value="updated reqs" />
-    <MESSAGE value="chore: moved all django elements up one level&#10;&#10;merged .gitignores" />
-    <MESSAGE value="fix: updated path for nix GHA" />
-    <MESSAGE value="missed this" />
-    <MESSAGE value="test gpg signing" />
-    <MESSAGE value="fix: .save being  placed in the wrong model&#10;&#10;feat: auto-create groups" />
-    <MESSAGE value="Updated group name. &#10;&#10;changed some styling &#10;&#10;updated some docs." />
-    <MESSAGE value="updated lock." />
-    <MESSAGE value="simplified form logic &#10;hehe :D (updated default team name &#10;&#10;added a current_hunt classmethod to Hunt" />
-    <MESSAGE value="removed duplicate .save()&#10;&#10;(create already saves it)" />
-    <MESSAGE value="fixed order of operations for team.save" />
-    <MESSAGE value="Limit to one event at a time" />
-    <MESSAGE value="added django-impersonate" />
-    <MESSAGE value="added &quot;new_event&quot; command to save teams then nuke em." />
-    <MESSAGE value="format." />
-    <MESSAGE value="format v2!" />
-    <MESSAGE value="im foolish but I want to commit for the future" />
-    <MESSAGE value="feat: added members to team admin" />
-    <MESSAGE value="&#10;Updated timezone and removed the configs in settings.py in favor of Hunt settings &#10;&#10;Fixed team logic for Hunts &#10;&#10;&#10;renamed a field" />
-    <option name="LAST_COMMIT_MESSAGE" value="&#10;Updated timezone and removed the configs in settings.py in favor of Hunt settings &#10;&#10;Fixed team logic for Hunts &#10;&#10;&#10;renamed a field" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
-    <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
-  </component>
-  <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/scavenger$auth.coverage" NAME="auth Coverage Results" MODIFIED="1701139640006" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/wlmac-scavenger/core/views" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/core/admin.py b/core/admin.py
index 960cf81..c42e9eb 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -1,4 +1,4 @@
-from django.contrib import admin
+from django.contrib import admin, messages
 from django.contrib.auth.admin import UserAdmin as UserAdmin_
 from django.contrib.auth.models import Group
 from django.utils.safestring import mark_safe
@@ -113,13 +113,33 @@ def url(self, qr):
         if qr.id:
             return format_html(
                 mark_safe('<a href="{}">{}</a>'),
-                (url := reverse("qr", kwargs=dict(key=qr.key))),
+                reverse("qr", kwargs=dict(key=qr.key)),
                 _("Link to Hint Page"),
             )
         else:
             return ""
 
 
+class HuntAdmin(admin.ModelAdmin):
+    def save_model(self, request, obj, form, change):
+        # todo: add warning if admin attempts to change path length or middle locations when hunt has started (will basically re-randomize the hunt (I THINK))
+
+        # extras = 1 if obj.starting_location else 0
+        # extras += 1 if obj.ending_location else 0
+
+        if obj.path_length > obj.middle_locations.count():
+            messages.warning(
+                request,
+                "The path length is longer than the amount of locations. "
+                "If you do not increase middle locations or decrease path length, "
+                "the path length will be reduced to the amount of locations.",
+            )
+            # raise ValidationError(
+            #    "The path length is longer than the amount of locations. Please increase the amount of locations or decrease the path length."
+            # )
+        super().save_model(request, obj, form, change)
+
+
 class UserAdmin(UserAdmin_):
     readonly_fields = (
         "username",
@@ -148,5 +168,5 @@ class UserAdmin(UserAdmin_):
 admin.site.register(Team, TeamAdmin)
 admin.site.register(QrCode, QrCodeAdmin)
 admin.site.register(LogicPuzzleHint, LogicPuzzleAdmin)
-admin.site.register(Hunt)
+admin.site.register(Hunt, HuntAdmin)
 admin.site.register(Invite)
diff --git a/core/context_processors.py b/core/context_processors.py
index 7e1c569..db16049 100644
--- a/core/context_processors.py
+++ b/core/context_processors.py
@@ -1,14 +1,29 @@
 import datetime
 
-from django.conf import settings
+from core.models import Hunt
+from django.utils import timezone
 
 
 def start(request):
+    now = timezone.now()
+    if (hunt := Hunt.current_hunt()) is not None:
+        event_start = hunt.start
+        event_end = hunt.end
+    elif Hunt.next_hunt() is not None:
+        hunt = Hunt.next_hunt()
+        event_start = hunt.start
+        event_end = hunt.end
+    else:
+        print("WARNING: No hunt is scheduled")
+        print("Please add a hunt in the future to the database")
+        event_start = now + datetime.timedelta(weeks=75)
+        event_end = event_start + datetime.timedelta(hours=3)
+
     return dict(
-        START=(start := settings.START),
-        START_BEFORE=start > datetime.datetime.utcnow(),
-        START_UNTIL=start - datetime.datetime.utcnow(),
-        END=(end := settings.END),
-        END_BEFORE=end > datetime.datetime.utcnow(),
-        END_UNTIL=end - datetime.datetime.utcnow(),
+        START=event_start,
+        START_BEFORE=event_start > now,
+        START_UNTIL=event_start - now,
+        END=event_end,
+        END_BEFORE=event_end > now,
+        END_UNTIL=event_end - now,
     )
diff --git a/core/locale/en_CA/LC_MESSAGES/django.mo b/core/locale/en_CA/LC_MESSAGES/django.mo
index 6c5906d..5d3a732 100644
Binary files a/core/locale/en_CA/LC_MESSAGES/django.mo and b/core/locale/en_CA/LC_MESSAGES/django.mo differ
diff --git a/core/locale/en_CA/LC_MESSAGES/django.po b/core/locale/en_CA/LC_MESSAGES/django.po
index b4692ff..68ce15a 100644
--- a/core/locale/en_CA/LC_MESSAGES/django.po
+++ b/core/locale/en_CA/LC_MESSAGES/django.po
@@ -8,89 +8,122 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-17 01:39+0000\n"
+"POT-Creation-Date: 2023-12-03 14:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Last-Translator: Jason Cameron <jason@jasoncameron.dev>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: core/templates/core/base.html:22
-msgid "starts in:"
+#: .\core\admin.py:14
+msgid "Set selected users as a Location Setter"
 msgstr ""
 
-#: core/templates/core/base.html:23
-msgid "ends in:"
+#: .\core\admin.py:25
+msgid "Set selected users as a Logic Puzzle Setter"
 msgstr ""
 
-#: core/templates/core/base.html:24
+#: .\core\admin.py:117
+msgid "Link to Hint Page"
+msgstr ""
+
+#: .\core\templates\core\base.html:22
+msgid "starts in"
+msgstr ""
+
+#: .\core\templates\core\base.html:23
+msgid "__startsPost"
+msgstr ""
+
+#: .\core\templates\core\base.html:24
+msgid " __endsPre"
+msgstr "Hurry Hurry!"
+
+#: .\core\templates\core\base.html:25
+msgid "remaining"
+msgstr "remaining"
+
+#: .\core\templates\core\base.html:26
 msgid "scavenger hunt ended!"
 msgstr ""
 
-#: core/templates/core/base.html:145
+#: .\core\templates\core\base.html:105
 msgid "Home"
 msgstr ""
 
-#: core/templates/core/base.html:152
+#: .\core\templates\core\base.html:112
 msgid "Admin"
 msgstr ""
 
-#: core/templates/core/base.html:158
+#: .\core\templates\core\base.html:117
 msgid "current"
 msgstr ""
 
-#: core/templates/core/base.html:163 core/templates/core/logout.html:6
+#: .\core\templates\core\base.html:121 .\core\templates\core\logout.html:6
 msgid "Logout"
 msgstr ""
 
-#: core/templates/core/credits.html:6
+#: .\core\templates\core\base.html:128
+msgid "Login"
+msgstr ""
+
+#: .\core\templates\core\credits.html:6
 msgid "Credits"
 msgstr ""
 
-#: core/templates/core/credits.html:10
+#: .\core\templates\core\credits.html:10
 msgid "credits"
 msgstr ""
 
-#: core/templates/core/credits.html:14
-msgid ""
-"\n"
-"project manager: ApocalypseCalculator<br />\n"
-"programming: nyiyui, JasonLovesDoggo, Jimmy Liu, cheollie, and Misheel "
-"Batkhuu<br />\n"
-"UI/UX design: cheollie<br />\n"
-"support: <a href=\"https://maclyonsden.com\">project metropolis</a> and "
-"SAC<br />\n"
+#: .\core\templates\core\credits.html:14
+msgid "project manager"
 msgstr ""
 
-#: core/templates/core/credits.html:20
+#: .\core\templates\core\credits.html:19
+msgid "programming"
+msgstr ""
+
+#: .\core\templates\core\credits.html:28
+msgid "content"
+msgstr ""
+
+#: .\core\templates\core\credits.html:34
+msgid "UI/UX design"
+msgstr ""
+
+#: .\core\templates\core\credits.html:41
 msgid "hints"
 msgstr ""
 
-#: core/templates/core/gate.html:6 core/templates/core/index.html:6
+#: .\core\templates\core\credits.html:48
+msgid "support"
+msgstr ""
+
+#: .\core\templates\core\gate.html:6 .\core\templates\core\index.html:6
 msgid "Scavenger Hunt"
 msgstr ""
 
-#: core/templates/core/gate.html:11
+#: .\core\templates\core\gate.html:11
 msgid "The hunt has not begun yet."
 msgstr ""
 
-#: core/templates/core/gate.html:14
+#: .\core\templates\core\gate.html:14
 #, python-format
 msgid ""
 "\n"
 "Please <a href=\"%(login_url)s\">login</a>.\n"
 msgstr ""
 
-#: core/templates/core/index.html:11
+#: .\core\templates\core\index.html:10
 #, python-format
 msgid ""
 "\n"
 "welcome, %(username)s!\n"
 msgstr ""
 
-#: core/templates/core/index.html:23
+#: .\core\templates\core\index.html:23
 #, python-format
 msgid ""
 "\n"
@@ -99,23 +132,23 @@ msgid ""
 "  "
 msgstr ""
 
-#: core/templates/core/index.html:29
+#: .\core\templates\core\index.html:29
 #, python-format
 msgid ""
 "\n"
-"      or, do you still want to <a href=\"%(invite_url)s\">invite team "
+"      or, would you like to <a href=\"%(invite_url)s\">invite more team "
 "members</a>?\n"
 "    "
 msgstr ""
 
-#: core/templates/core/index.html:36
+#: .\core\templates\core\index.html:37
 msgid ""
 "\n"
 "        you're going solo\n"
 "      "
 msgstr ""
 
-#: core/templates/core/index.html:40
+#: .\core\templates\core\index.html:41
 #, python-format
 msgid ""
 "\n"
@@ -123,125 +156,127 @@ msgid ""
 "      "
 msgstr ""
 
-#: core/templates/core/index.html:48 core/templates/core/team_join.html:10
+#: .\core\templates\core\index.html:50 .\core\templates\core\team_join.html:10
 msgid "join a team"
 msgstr ""
 
-#: core/templates/core/index.html:51 core/templates/core/team_new.html:10
+#: .\core\templates\core\index.html:53 .\core\templates\core\team_new.html:10
 msgid "make a team"
 msgstr ""
 
-#: core/templates/core/index.html:57
+#: .\core\templates\core\index.html:60
 msgid "go solo "
 msgstr ""
 
-#: core/templates/core/logic_hints.html:8
-msgid "Logic Clues"
-msgstr ""
-
-#: core/templates/core/logic_hints.html:13
-msgid "All of your logic clues so far"
-msgstr ""
-
-#: core/templates/core/logout.html:10 core/templates/core/logout.html:16
+#: .\core\templates\core\logout.html:10 .\core\templates\core\logout.html:16
 msgid "logout"
 msgstr ""
 
-#: core/templates/core/qr.html:10
+#: .\core\templates\core\qr.html:10
 msgid "Hint"
 msgstr ""
 
-#: core/templates/core/qr.html:32
+#: .\core\templates\core\qr.html:33
 msgid "your team found:"
 msgstr ""
 
-#: core/templates/core/qr.html:36
+#: .\core\templates\core\qr.html:37
 msgid "change"
 msgstr ""
 
-#: core/templates/core/qr.html:44
+#: .\core\templates\core\qr.html:46
 msgid "your first hint is:"
 msgstr ""
 
-#: core/templates/core/qr.html:46
+#: .\core\templates\core\qr.html:48
 msgid "your next hint is:"
 msgstr ""
 
-#: core/templates/core/qr.html:68
-msgid "thank you for playing!"
+#: .\core\templates\core\qr.html:72
+msgid ""
+"Oh ho? What lieth there? Tis the light at the end of the tunnel! <br /> "
+"Congratulations valiant scavenger and thank you for playing!"
 msgstr ""
 
-#: core/templates/core/team_invite.html:7
+#: .\core\templates\core\team_invite.html:7
 msgid "Invite Members"
 msgstr ""
 
-#: core/templates/core/team_invite.html:11
+#: .\core\templates\core\team_invite.html:11
 msgid "invite members"
 msgstr ""
 
-#: core/templates/core/team_invite.html:28
+#: .\core\templates\core\team_invite.html:33
 #, python-format
 msgid ""
 "\n"
-"      either you can\n"
-"      <input type=\"button\" value=\"copy the join link\" id=\"share-btn\" "
-"data-share-text=\"share the join link\" data-join-link=\"%(join_link)s\" /"
-">,\n"
-"      or let them scan the QR code below:\n"
-"    "
+"            you may either\n"
+"            <input type=\"button\" class=\"qr-uri\" value=\"copy the join "
+"link\" id=\"share-btn\"\n"
+"                   data-share-text=\"click here to copy the join code\" data-"
+"join-link=\"%(join_link)s\"/>,\n"
+"            share via invite code <code>%(code)s</code>,\n"
+"            or allow them to scan the QR code below:\n"
+"        "
 msgstr ""
 
-#: core/templates/core/team_join.html:6
+#: .\core\templates\core\team_join.html:6
 msgid "Join a Team"
 msgstr ""
 
-#: core/templates/core/team_join.html:14
+#: .\core\templates\core\team_join.html:14
 msgid "either enter your team's join code"
 msgstr ""
 
-#: core/templates/core/team_join.html:18
+#: .\core\templates\core\team_join.html:18
 msgid "Join"
 msgstr ""
 
-#: core/templates/core/team_join.html:20
+#: .\core\templates\core\team_join.html:20
 msgid "or, scan your team's QR code"
 msgstr ""
 
-#: core/templates/core/team_new.html:6
+#: .\core\templates\core\team_new.html:6
 msgid "Make a Team"
 msgstr ""
 
-#: core/templates/core/team_new.html:27
-msgid "make"
+#: .\core\templates\core\team_new.html:24
+msgid "create"
 msgstr ""
 
-#: core/views/qr.py:28
+#: .\core\views\qr.py:28
 msgid "Please join a team or choose to go solo before getting a hint."
 msgstr ""
 
-#: core/views/qr.py:46
+#: .\core\views\qr.py:66
 msgid "Contest has not started yet."
 msgstr ""
 
-#: core/views/team.py:23
-msgid "Since the hunt has already begun, switching teams is disallowed."
+#: .\core\views\qr.py:71
+msgid "Contest has ended."
+msgstr ""
+
+#: .\core\views\team.py:25
+msgid ""
+"Since the hunt has already begun, switching teams is disallowed. If you need "
+"to switch teams, please contact an admin."
 msgstr ""
 
-#: core/views/team.py:40
+#: .\core\views\team.py:45
 #, python-format
 msgid "Joined team %(team_name)s"
 msgstr ""
 
-#: core/views/team.py:46
+#: .\core\views\team.py:51
 #, python-format
 msgid "Team %(team_name)s is full."
 msgstr ""
 
-#: core/views/team.py:63
+#: .\core\views\team.py:69
 msgid "Since the hunt has already begun, making new teams is disallowed."
 msgstr ""
 
-#: core/views/team.py:76
+#: .\core\views\team.py:85
 #, python-format
 msgid "Made team %(team_name)s"
 msgstr ""
diff --git a/core/locale/ja_JP/LC_MESSAGES/django.mo b/core/locale/ja_JP/LC_MESSAGES/django.mo
index e894a2b..d9e955c 100644
Binary files a/core/locale/ja_JP/LC_MESSAGES/django.mo and b/core/locale/ja_JP/LC_MESSAGES/django.mo differ
diff --git a/core/migrations/0019_alter_qrcode_key_hunt_logicpuzzlehint_belongs_to_and_more.py b/core/migrations/0019_alter_qrcode_key_hunt_logicpuzzlehint_belongs_to_and_more.py
index c61d716..695ff3e 100644
--- a/core/migrations/0019_alter_qrcode_key_hunt_logicpuzzlehint_belongs_to_and_more.py
+++ b/core/migrations/0019_alter_qrcode_key_hunt_logicpuzzlehint_belongs_to_and_more.py
@@ -31,7 +31,7 @@ def undo_create_hunt(apps, schema_editor):
 
     try:
         Hunt.objects.get(name="First Hunt").delete()
-    except Hunt.DoesNotExist:
+    except (Hunt.DoesNotExist, django.db.utils.OperationalError):
         pass
 
 
diff --git a/core/migrations/0021_hunt_middle_locations.py b/core/migrations/0021_hunt_middle_locations.py
new file mode 100644
index 0000000..9ca1f56
--- /dev/null
+++ b/core/migrations/0021_hunt_middle_locations.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.1.13 on 2023-12-03 19:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0020_remove_hunt_form_in_ending_text_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="hunt",
+            name="middle_locations",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Possible locations that are not the start or end",
+                related_name="hunt",
+                to="core.qrcode",
+            ),
+        ),
+    ]
diff --git a/core/migrations/0022_remove_hunt_early_access_users_hunt_testers.py b/core/migrations/0022_remove_hunt_early_access_users_hunt_testers.py
new file mode 100644
index 0000000..f830316
--- /dev/null
+++ b/core/migrations/0022_remove_hunt_early_access_users_hunt_testers.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.1.13 on 2023-12-03 20:44
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0021_hunt_middle_locations"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="hunt",
+            old_name="early_access_users",
+            new_name="testers",
+        ),
+        migrations.AlterField(
+            model_name="hunt",
+            name="testers",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="Users that can access this hunt before it starts as well as after",
+                related_name="testers",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/core/models.py b/core/models.py
index 8f84743..aae8ec1 100644
--- a/core/models.py
+++ b/core/models.py
@@ -2,10 +2,12 @@
 
 import random
 import secrets
+from typing import List
 
 from django.contrib.auth.models import AbstractUser
 from django.core.exceptions import ValidationError
 from django.db import models
+from django.db.models import QuerySet
 from django.db.models.signals import pre_save
 from django.dispatch import receiver
 from django.utils import timezone
@@ -75,22 +77,34 @@ def __str__(self):
         return f"{self.id} {self.short or self.location}"
 
     @classmethod
-    def codes(cls, team: "Team"):
+    def codes(
+        cls, team: "Team"
+    ) -> List[QrCode]:  # todo: have this return an ordered QuerySet instead of a list
         pks = QrCode.code_pks(team)
         return [QrCode.objects.get(id=a) for a in pks]
 
     @classmethod
     def code_pks(cls, team: "Team"):
-        r = random.Random(team.id)
-        pks = [a["pk"] for a in QrCode.objects.all().values("pk")]
-        pks = pks[: team.hunt.path_length]
+        """
+        Returns the QR codes that the team has to find in order.
+        The algorithm behind this system is as follows:
+        1. Get the hunt that the team belongs to
+        2. Get the QR codes that are in the middle of the path for the specified hunt
+        3. Shuffle QR codes (using the team id appended to hunt id as the key)
+        4. Get the first n QR codes (n being the path length)
+        5. Add the starting and ending QR codes to list
+        6. Return the list
+        """
+        hunt: Hunt = team.hunt
+        r = random.Random(str(hunt.id) + str(team.id))
+        hunt_codes = hunt.middle_locations.all()
+        pks = [a["pk"] for a in hunt_codes.values("pk")]
         r.shuffle(pks)
-        if isinstance((pk := team.hunt.ending_location_id), int):
-            i = pks.index(pk) if pk in pks else r.randrange(0, len(pks))
-            pks = pks[:i] + pks[i + 1 :] + [pk]
-        if isinstance((pk := team.hunt.starting_location_id), int):
-            i = pks.index(pk) if pk in pks else r.randrange(0, len(pks))
-            pks = [pk] + pks[:i] + pks[i + 1 :]
+        pks = pks[: hunt.path_length]
+        if hunt_end := hunt.ending_location:
+            pks.append(hunt_end.id)
+        if hunt_start := hunt.starting_location:
+            pks.insert(0, hunt_start.id)
         return pks
 
     def hint(self, team: "Team"):
@@ -195,19 +209,34 @@ class Hunt(models.Model):
         default=4, help_text="Max Team size"
     )
     path_length = models.PositiveSmallIntegerField(
-        default=15,
-        help_text="Length of the path: The amount of codes each time will have to find before the end.",
+        default=13,
+        help_text="Length of the path: The amount of codes each time will have to find before the end. (not including start/end)",
     )
     starting_location = models.ForeignKey(
-        QrCode, on_delete=models.PROTECT, related_name="starting_location"
+        QrCode,
+        on_delete=models.PROTECT,
+        related_name="starting_location",
+        blank=True,
+        null=True,
+        help_text="(Optional) A specified starting location for the hunt. All teams will have to scan this QR code as their first.",
     )
     ending_location = models.ForeignKey(
-        QrCode, on_delete=models.PROTECT, related_name="ending_location"
+        QrCode,
+        on_delete=models.PROTECT,
+        related_name="ending_location",
+        blank=True,
+        help_text="(Optional) A specified ending location for the hunt. All teams will get as their last location.",
     )
-    early_access_users = models.ManyToManyField(
+    middle_locations = models.ManyToManyField(
+        QrCode,
+        related_name="hunt",
+        help_text="Possible locations that are not the start or end",
+        blank=True,
+    )
+    testers = models.ManyToManyField(
         User,
-        related_name="early_access_users",
-        help_text="Users that can access this hunt before it starts",
+        related_name="testers",
+        help_text="Users that can access this hunt before it starts as well as after",
         blank=True,
     )
     form_url = models.URLField(
@@ -224,12 +253,40 @@ def __str__(self):
         return self.name
 
     @classmethod
-    def current_hunt(cls):
+    def lastest_hunt(cls) -> Hunt | None:
+        """
+        Returns the latest hunt, ended or not.
+        :return: Hunt or None
+        """
+        try:
+            Hunt.objects.filter(start__lte=timezone.now()).order_by("start").last()
+        except IndexError:
+            return None
+
+    @classmethod
+    def current_hunt(cls) -> Hunt | None:
         try:
             return cls.objects.get(start__lte=timezone.now(), end__gte=timezone.now())
         except cls.DoesNotExist:
             return None
 
+    @classmethod
+    def next_hunt(cls) -> Hunt | None:
+        try:
+            return (
+                cls.objects.filter(start__gte=timezone.now()).order_by("start").first()
+            )
+        except IndexError:
+            return None
+
+    @property
+    def started(self):
+        return self.start < timezone.now()
+
+    @property
+    def ended(self):
+        return self.end < timezone.now()
+
     def clean(self):
         """
         Due to how this was designed, it is not possible to have multiple hunts running at the same time.
diff --git a/core/static/core/countdown.js b/core/static/core/countdown.js
index 1af3968..5373540 100644
--- a/core/static/core/countdown.js
+++ b/core/static/core/countdown.js
@@ -49,8 +49,8 @@ const newCalculateTime = (start, end, startsPre, startsPost, endsPre, endsPost,
   startsPost = startsPost.startsWith('__') ? '' : startsPost
   endsPre = endsPre.endsWith('__') ? '' : endsPre
   endsPost = endsPost.endsWith('__') ? '' : endsPost
-  eTextPre.innerText = started ? (finished ? ended : endsPre) : startsPre
-  eTextPost.innerText = started ? (finished ? ended : endsPost) : startsPost
+  eTextPre.innerText = started ? startsPre : (finished ? ended : endsPre)
+  eTextPost.innerText = started ? startsPost : (finished ? ended : endsPost)
 }
 
 export default newCalculateTime
diff --git a/core/templates/core/base.html b/core/templates/core/base.html
index f0e069e..59e9775 100644
--- a/core/templates/core/base.html
+++ b/core/templates/core/base.html
@@ -20,8 +20,8 @@
             {{ START.timestamp }} * 1000,
             {{ END.timestamp }} * 1000,
             "{% translate 'starts in' %}",
-            "{% translate '__startsPost' %}",
-            "{% translate '__endsPre' %}",
+            "{% translate '' %}",
+            "{% translate 'Only' %}",
             "{% translate 'remaining' %}",
             "{% translate 'scavenger hunt ended!' %}",
           )
diff --git a/core/templates/core/credits.html b/core/templates/core/credits.html
index 2e9c08b..51e625f 100644
--- a/core/templates/core/credits.html
+++ b/core/templates/core/credits.html
@@ -3,49 +3,51 @@
 {% load static %}
 
 {% block title %}
-{% translate 'Credits' %}
+    {% translate 'Credits' %}
 {% endblock %}
 
 {% block header %}
-{% translate 'credits' %}
+    {% translate 'credits' %}
 {% endblock %}
 
 {% block body %}
-<h2>{% translate 'project manager' %}</h2>
-<ul class="nodot">
-  <li>Patrick Lin</li>
-</ul>
-
-<h2>{% translate 'programming' %}</h2>
-<ul class="nodot">
-    <li>Jason Cameron</li>
-    <li>nyiyui</li>
-    <li>Jimmy Liu</li>
-    <li>Glen Lin</li>
-    <li>Joshua Wang</li>
-    <li>Chelsea Wong</li>
-</ul>
-
-<h2>{% translate 'content' %}</h2>
-<ul class="nodot">
-  <li>Misheel Batkhuu</li>
-</ul>
-
-<h2>{% translate 'UI/UX design' %}</h2>
-<ul class="nodot">
-  <li>Chelsea Wong</li>
-</ul>
-
-<h2>{% translate 'hints' %}</h2>
-<ul class="nodot">
-  {% for hs in hintsetters %}
-    <li>{{ hs.get_full_name }}</li>
-  {% endfor %}
-</ul>
-
-<h2>{% translate 'support' %}</h2>
-<ul class="nodot">
-  <li><a href="https://maclyonsden.com">project metropolis</a></li>
-  <li>Student Council</li>
-</ul>
+    <h2>{% translate 'project manager' %}</h2>
+    <ul class="nodot">
+        <li>Patrick Lin</li>
+    </ul>
+
+    <h2>{% translate 'programming' %}</h2>
+    <ul class="nodot">
+        <li>Jason Cameron</li>
+        <li>nyiyui</li>
+        <li>Jimmy Liu</li>
+        <li>Glen Lin</li>
+        <li>Joshua Wang</li>
+    </ul>
+
+    <h2>{% translate 'content' %}</h2>
+    <ul class="nodot">
+        <li>Misheel Batkhuu</li>
+        <li>Warisha Shams</li>
+    </ul>
+
+    <h2>{% translate 'UI/UX design' %}</h2>
+    <ul class="nodot">
+        <li>Chelsea Wong</li>
+        <li>Daniel Ye</li>
+        <li>Patrick Bian</li>
+    </ul>
+
+    <h2>{% translate 'hints' %}</h2>
+    <ul class="nodot">
+        {% for hs in hintsetters %}
+            <li>{{ hs.get_full_name }}</li>
+        {% endfor %}
+    </ul>
+
+    <h2>{% translate 'support' %}</h2>
+    <ul class="nodot">
+        <li><a href="https://maclyonsden.com">project metropolis</a></li>
+        <li>Student Council</li>
+    </ul>
 {% endblock %}
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index 9afc798..e5c0b3c 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -21,7 +21,7 @@
 {% if request.user.in_team and not START_BEFORE %}
   {% url 'qr_first' as first_url %}
   {% blocktranslate %}
-    the hunt has started! go decrypt your <a href="{{ first_url }}">first hint</a>!
+      {{ hunt_name }} has started! go decrypt your <a href="{{ first_url }}">first hint</a>!
   {% endblocktranslate %}
   <br />
   {% if not request.user.team.solo %}
diff --git a/core/templates/core/qr.html b/core/templates/core/qr.html
index 55d4dac..4f7043d 100644
--- a/core/templates/core/qr.html
+++ b/core/templates/core/qr.html
@@ -65,10 +65,13 @@
                 </div>
             {% endif %}
         {% else %}
-            {% ending_block qr.hunt %}
-            You found Derek! Now, solve the entirety of the logic puzzle to find which of the 5 SAC members in question this locker belongs to <a href="https://forms.gle/eAghxHxWRiXWgeKF9">here</a>! Oh, and close the locker, a dead Derek smells bad.
+            {% ending_block request.user.team.hunt %}
             {% translate 'Oh ho? What lieth there? Tis the light at the end of the tunnel! <br /> Congratulations valiant scavenger and thank you for playing!' %}
         {% endif %}
-    </div></div>
-    {% endif %}
+        </div></div> <!-- Why does this exist.. -->
+    {% else %} {
+
+{% translate 'Incorrect QR code, please read your hint again or contact an organizer' %}
+
+{% endif %}
 {% endblock %}
diff --git a/core/templatetags/qr.py b/core/templatetags/qr.py
index 21b5fd7..9a7fda2 100644
--- a/core/templatetags/qr.py
+++ b/core/templatetags/qr.py
@@ -27,7 +27,7 @@ def ending_block(hunt):
         return format_html(
             hunt.ending_text.replace(
                 match.group(0),
-                '<a href="{}">{}</a>'.format(hunt.ending_form, ending_text),
+                '<a href="{}">{}</a>'.format(hunt.form_url, ending_text),
             )
         )
     return hunt.ending_text
diff --git a/core/views/index.py b/core/views/index.py
index db5a8f2..5df8582 100644
--- a/core/views/index.py
+++ b/core/views/index.py
@@ -3,15 +3,18 @@
 from django.contrib.auth.models import Group
 from django.views.decorators.http import require_http_methods
 
-from ..models import User
+from ..models import User, Hunt
 
 
 @require_http_methods(["GET"])
 def index(q):
+    hunt = Hunt.current_hunt() or Hunt.next_hunt()
+    context = dict(first=False)
+    context["hunt_name"] = hunt or "The hunt"
     return render(
         q,
         "core/index.html" if q.user.is_authenticated else "core/gate.html",
-        {},
+        context,
     )
 
 
diff --git a/core/views/puzzle.py b/core/views/puzzle.py
index 6c2defb..c352d84 100644
--- a/core/views/puzzle.py
+++ b/core/views/puzzle.py
@@ -2,14 +2,14 @@
 from django.shortcuts import render
 from django.views.decorators.http import require_http_methods
 
-from .qr import team_required, after_start
+from .qr import team_required, during_hunt
 from ..models import LogicPuzzleHint
 
 
 @login_required
 @require_http_methods(["GET", "POST"])
 @team_required
-@after_start
+@during_hunt
 def logic_clues(request):
     context = dict(logic_clues=LogicPuzzleHint.get_clues(request.user.team))
     return render(request, "core/logic_hints.html", context=context)
diff --git a/core/views/qr.py b/core/views/qr.py
index 4a7c1fa..6e54c5c 100644
--- a/core/views/qr.py
+++ b/core/views/qr.py
@@ -1,18 +1,18 @@
 import datetime
+from functools import wraps
 from queue import LifoQueue
 
-from django.conf import settings
-from functools import wraps
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.views.decorators.http import require_http_methods
-from django.shortcuts import render, redirect, get_object_or_404
-from django.urls import reverse
-from django.utils.translation import gettext as _
-from ..models import QrCode, LogicPuzzleHint, Team
 from django.db.models import signals
 from django.dispatch import Signal, receiver
 from django.http import StreamingHttpResponse
+from django.shortcuts import render, redirect, get_object_or_404
+from django.urls import reverse
+from django.utils.translation import gettext as _
+from django.views.decorators.http import require_http_methods
+
+from ..models import QrCode, LogicPuzzleHint, Team, Hunt
 
 
 # NOTE: some of these GET routes are not idempotent, but that should be fine
@@ -33,22 +33,67 @@ def wrapped(*args, **kwargs):
     return wrapped
 
 
-def after_start(f):
+def upcoming_hunt_required(f):
+    @wraps(f)
+    def wrapped(*args, **kwargs):
+        request = args[0]
+        if Hunt.current_hunt() is None and Hunt.next_hunt() is None:
+            messages.error(
+                request, _("No hunts are in the database, please contact an admin.")
+            )
+            return redirect(reverse("index"))
+        return f(
+            *args, **kwargs
+        )  # todo: maybe return the hunt object to be used in the view? (more efficient)
+
+    return wrapped
+
+
+def during_hunt(f):
+    """
+    Decorator for views that checks that the hunt is currently active.
+
+    User can access the view if they meet ANY of the following conditions:
+    - They have the view_before_start permission and the hunt hasn't ended
+    - The hunt has started and hasn't ended
+    - They are on the testers list for that hunt
+    - They are a superuser
+    """
+
     @wraps(f)
+    @upcoming_hunt_required
     def wrapped(*args, **kwargs):
+        hunt_ = Hunt.current_hunt() or Hunt.next_hunt()
         request = args[0]
-        if (
-            not request.user.has_perm(
-                "core.view_before_start"
-            )  #  or current_hunt. todo impl
-            and settings.START > datetime.datetime.now()
+        if hunt_ is None:
+            messages.error(
+                request,
+                _("No hunt is currently active."),
+            )
+            return redirect(reverse("index"))
+
+        if any(
+            [
+                hunt_.started and not hunt_.ended,
+                request.user.has_perm("core.view_before_start") and not hunt_.ended,
+                hunt_.testers.contains(request.user),
+                request.user.is_superuser,
+            ]
         ):
+            return f(*args, **kwargs)
+
+        # if they DON'T have perms and the hunt hasn't started
+        if hunt_.ended:
+            messages.error(
+                request,
+                _("Contest has ended."),
+            )
+        else:
             messages.error(
                 request,
                 _("Contest has not started yet."),
             )
-            return redirect(reverse("index"))
-        return f(*args, **kwargs)
+        return redirect(reverse("index"))
 
     return wrapped
 
@@ -56,13 +101,17 @@ def wrapped(*args, **kwargs):
 @login_required
 @require_http_methods(["GET", "POST"])
 @team_required
-@after_start
+@during_hunt
 def qr(request, key):
     context = dict(first=False)
+    context["qr"]: QrCode
     context["qr"] = qr = get_object_or_404(QrCode, key=key)
-    context["hunt"] = qr.hunt
     codes = QrCode.code_pks(request.user.team)
-    if qr.id not in codes:
+    if qr.id != codes[request.user.team.current_qr_i]:
+        """
+        Either the user skipped ahead (is on path) or they found a random qr code (not on path)
+        Either way... not allowed
+        """
         context["offpath"] = True
         return render(request, "core/qr.html", context=context)
     i = codes.index(qr.id)
@@ -70,22 +119,21 @@ def qr(request, key):
         None if len(codes) <= (j := i + 1) else QrCode.objects.get(id=codes[j])
     )
     context["logic_hint"] = LogicPuzzleHint.get_clue(request.user.team)
-    # TODO: check if they skipped?
-    request.user.team.update_current_qr_i(i)
+    request.user.team.update_current_qr_i(i + 1)
     return render(request, "core/qr.html", context=context)
 
 
 @login_required
 @require_http_methods(["GET", "POST"])
 @team_required
-@after_start
+@during_hunt
 def qr_first(request):
     context = dict(first=True)
     # check if the user is on the first qr code
     # if request.user.team.current_qr_i != 0:
     #    messages.error(request, _("You are not on the first QR code."))
     #    return redirect(reverse("qr_current"))
-    context["qr"] = QrCode.codes(request.user.team)[0]
+    context["qr"] = QrCode.codes(request.user.team).first()
     codes = QrCode.code_pks(request.user.team)
     context["nextqr"] = QrCode.objects.get(id=codes[0])
     context["logic_hint"] = LogicPuzzleHint.get_clue(request.user.team)
@@ -95,15 +143,13 @@ def qr_first(request):
 @login_required
 @require_http_methods(["GET", "POST"])
 @team_required
-@after_start
+@during_hunt
 def qr_current(request):
     i = request.user.team.current_qr_i
     context = dict(first=i == 0, current=True)
-    context["qr"] = QrCode.codes(request.user.team)[request.user.team.current_qr_i]
-    codes = QrCode.code_pks(request.user.team)
-    context["nextqr"] = (
-        None if len(codes) <= (j := i + 1) else QrCode.objects.get(id=codes[j])
-    )
+    codes = QrCode.codes(request.user.team)
+    context["qr"] = codes[i]
+    context["nextqr"] = None if len(codes) <= (j := i + 1) else codes[j]
     context["logic_hint"] = LogicPuzzleHint.get_clue(request.user.team)
     return render(request, "core/qr.html", context=context)
 
@@ -111,7 +157,7 @@ def qr_current(request):
 @login_required
 @require_http_methods(["GET", "POST"])
 @team_required
-@after_start
+@during_hunt
 def qr_catalog(request):
     i = request.user.team.current_qr_i
     context = dict(first=i == 0, current=True)
@@ -167,7 +213,7 @@ def __next__(self):
 @login_required
 @require_http_methods(["GET"])
 @team_required
-@after_start
+@during_hunt
 def qr_signal(request):
     s = StreamingHttpResponse(
         SignalStream(signal=global_notifs, pk=request.user.team.id),
diff --git a/core/views/team.py b/core/views/team.py
index 2ea014d..091a971 100644
--- a/core/views/team.py
+++ b/core/views/team.py
@@ -11,13 +11,15 @@
 
 from ..models import Team, Invite, generate_invite_code, Hunt
 from ..forms import TeamJoinForm, TeamMakeForm
-from .qr import team_required
+from .qr import team_required, upcoming_hunt_required
 
 
 @login_required
 @require_http_methods(["GET", "POST"])
+@upcoming_hunt_required
 def join(request):
-    if settings.START < datetime.datetime.now() and request.user.team is not None:
+    hunt_ = Hunt.current_hunt() or Hunt.next_hunt()
+    if hunt_.started and request.user.team is not None:
         messages.error(
             request,
             _(
@@ -60,8 +62,10 @@ def join(request):
 
 @login_required
 @require_http_methods(["GET", "POST"])
+@upcoming_hunt_required
 def make(request):
-    if settings.START < datetime.datetime.now() and request.user.team is not None:
+    hunt_ = Hunt.current_hunt() or Hunt.next_hunt()
+    if hunt_.started and request.user.team is not None:
         messages.error(
             request,
             _("Since the hunt has already begun, making new teams is disallowed."),
@@ -71,7 +75,7 @@ def make(request):
         form = TeamMakeForm(request.POST)
         if form.is_valid():
             raw: Team = form.save(commit=False)
-            raw.hunt = Hunt.current_hunt()
+            raw.hunt = Hunt.current_hunt() or Hunt.next_hunt()
             raw.save()
             request.user.team = raw
             request.user.save()
@@ -90,9 +94,11 @@ def make(request):
 
 
 @login_required
+@upcoming_hunt_required
 def solo(q: HttpRequest):
+    hunt_ = Hunt.current_hunt() or Hunt.next_hunt()
     team = Team.objects.create(
-        solo=True, hunt=Hunt.current_hunt(), name=f"{q.user.username}'s Solo Team"
+        solo=True, hunt=hunt_, name=f"{q.user.username}'s Solo Team"
     )
     q.user.team = team
     q.user.save()
@@ -102,6 +108,7 @@ def solo(q: HttpRequest):
 @login_required
 @require_http_methods(["GET"])
 @team_required
+@upcoming_hunt_required  # redundant
 def invite(q):
     invites = Invite.objects.filter(team=q.user.team).values_list("code", flat=True)
     if invites.count() == 0:
diff --git a/poetry.lock b/poetry.lock
index 339a307..aaacb38 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand.
 
 [[package]]
 name = "asgiref"
@@ -59,6 +59,48 @@ files = [
 [package.extras]
 tzdata = ["tzdata"]
 
+[[package]]
+name = "black"
+version = "23.11.0"
+description = "The uncompromising code formatter."
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "black-23.11.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:dbea0bb8575c6b6303cc65017b46351dc5953eea5c0a59d7b7e3a2d2f433a911"},
+    {file = "black-23.11.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:412f56bab20ac85927f3a959230331de5614aecda1ede14b373083f62ec24e6f"},
+    {file = "black-23.11.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d136ef5b418c81660ad847efe0e55c58c8208b77a57a28a503a5f345ccf01394"},
+    {file = "black-23.11.0-cp310-cp310-win_amd64.whl", hash = "sha256:6c1cac07e64433f646a9a838cdc00c9768b3c362805afc3fce341af0e6a9ae9f"},
+    {file = "black-23.11.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:cf57719e581cfd48c4efe28543fea3d139c6b6f1238b3f0102a9c73992cbb479"},
+    {file = "black-23.11.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:698c1e0d5c43354ec5d6f4d914d0d553a9ada56c85415700b81dc90125aac244"},
+    {file = "black-23.11.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:760415ccc20f9e8747084169110ef75d545f3b0932ee21368f63ac0fee86b221"},
+    {file = "black-23.11.0-cp311-cp311-win_amd64.whl", hash = "sha256:58e5f4d08a205b11800332920e285bd25e1a75c54953e05502052738fe16b3b5"},
+    {file = "black-23.11.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:45aa1d4675964946e53ab81aeec7a37613c1cb71647b5394779e6efb79d6d187"},
+    {file = "black-23.11.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c44b7211a3a0570cc097e81135faa5f261264f4dfaa22bd5ee2875a4e773bd6"},
+    {file = "black-23.11.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9acad1451632021ee0d146c8765782a0c3846e0e0ea46659d7c4f89d9b212b"},
+    {file = "black-23.11.0-cp38-cp38-win_amd64.whl", hash = "sha256:fc7f6a44d52747e65a02558e1d807c82df1d66ffa80a601862040a43ec2e3142"},
+    {file = "black-23.11.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7f622b6822f02bfaf2a5cd31fdb7cd86fcf33dab6ced5185c35f5db98260b055"},
+    {file = "black-23.11.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:250d7e60f323fcfc8ea6c800d5eba12f7967400eb6c2d21ae85ad31c204fb1f4"},
+    {file = "black-23.11.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5133f5507007ba08d8b7b263c7aa0f931af5ba88a29beacc4b2dc23fcefe9c06"},
+    {file = "black-23.11.0-cp39-cp39-win_amd64.whl", hash = "sha256:421f3e44aa67138ab1b9bfbc22ee3780b22fa5b291e4db8ab7eee95200726b07"},
+    {file = "black-23.11.0-py3-none-any.whl", hash = "sha256:54caaa703227c6e0c87b76326d0862184729a69b73d3b7305b6288e1d830067e"},
+    {file = "black-23.11.0.tar.gz", hash = "sha256:4c68855825ff432d197229846f971bc4d6666ce90492e5b02013bcaca4d9ab05"},
+]
+
+[package.dependencies]
+click = ">=8.0.0"
+mypy-extensions = ">=0.4.3"
+packaging = ">=22.0"
+pathspec = ">=0.9.0"
+platformdirs = ">=2"
+tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
+typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""}
+
+[package.extras]
+colorama = ["colorama (>=0.4.3)"]
+d = ["aiohttp (>=3.7.4)"]
+jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"]
+uvloop = ["uvloop (>=0.15.2)"]
+
 [[package]]
 name = "certifi"
 version = "2023.11.17"
@@ -233,6 +275,31 @@ files = [
     {file = "charset_normalizer-3.3.2-py3-none-any.whl", hash = "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc"},
 ]
 
+[[package]]
+name = "click"
+version = "8.1.7"
+description = "Composable command line interface toolkit"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"},
+    {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"},
+]
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+description = "Cross-platform colored terminal text."
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7"
+files = [
+    {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"},
+    {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"},
+]
+
 [[package]]
 name = "cryptography"
 version = "41.0.7"
@@ -373,6 +440,54 @@ files = [
     {file = "mistune-3.0.2.tar.gz", hash = "sha256:fc7f93ded930c92394ef2cb6f04a8aabab4117a91449e72dcc8dfa646a508be8"},
 ]
 
+[[package]]
+name = "mypy-extensions"
+version = "1.0.0"
+description = "Type system extensions for programs checked with the mypy type checker."
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"},
+    {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"},
+]
+
+[[package]]
+name = "packaging"
+version = "23.2"
+description = "Core utilities for Python packages"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"},
+    {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"},
+]
+
+[[package]]
+name = "pathspec"
+version = "0.11.2"
+description = "Utility library for gitignore style pattern matching of file paths."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pathspec-0.11.2-py3-none-any.whl", hash = "sha256:1d6ed233af05e679efb96b1851550ea95bbb64b7c490b0f5aa52996c11e92a20"},
+    {file = "pathspec-0.11.2.tar.gz", hash = "sha256:e0d8d0ac2f12da61956eb2306b69f9469b42f4deb0f3cb6ed47b9cce9996ced3"},
+]
+
+[[package]]
+name = "platformdirs"
+version = "4.0.0"
+description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "platformdirs-4.0.0-py3-none-any.whl", hash = "sha256:118c954d7e949b35437270383a3f2531e99dd93cf7ce4dc8340d3356d30f173b"},
+    {file = "platformdirs-4.0.0.tar.gz", hash = "sha256:cb633b2bcf10c51af60beb0ab06d2f1d69064b43abf4c185ca6b28865f3f9731"},
+]
+
+[package.extras]
+docs = ["furo (>=2023.7.26)", "proselint (>=0.13)", "sphinx (>=7.1.1)", "sphinx-autodoc-typehints (>=1.24)"]
+test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)"]
+
 [[package]]
 name = "pycparser"
 version = "2.21"
@@ -421,6 +536,17 @@ dev = ["build", "flake8"]
 doc = ["sphinx"]
 test = ["pytest", "pytest-cov"]
 
+[[package]]
+name = "tomli"
+version = "2.0.1"
+description = "A lil' TOML parser"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
+    {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.8.0"
@@ -462,5 +588,4 @@ zstd = ["zstandard (>=0.18.0)"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "9f7ca6a088c6b910bc55cc7a9368ce083a9279353d61dffbfb277e44472113bf"
-
+content-hash = "94092c6d189cacb49a082d696195c49bcb804654f76ed0f434eaf6b8cbaebb9b"
diff --git a/pyproject.toml b/pyproject.toml
index af8bb4f..d963f5a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -13,6 +13,7 @@ fontawesomefree = "^6.2.1"
 mistune = "^3.0.2"
 django-ckeditor = "^6.0.0"
 django-impersonate = "^1.9.2"
+black = "^23.11.0"
 [tool.poetry.dev-dependencies]
 
 [build-system]
diff --git a/wlmac-scavenger/settings.py b/wlmac-scavenger/settings.py
index 87b2aec..d99f813 100644
--- a/wlmac-scavenger/settings.py
+++ b/wlmac-scavenger/settings.py
@@ -124,5 +124,3 @@
     raise TypeError("local_settings.py not found")
 
 SECRET_KEY  # type: ignore
-START  # type: ignore
-END  # type: ignore