diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 000000000..39515b10f
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,62 @@
+name: build
+
+on:
+  release:
+    types: [ released ]
+  pull_request:
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: micromamba-shell {0}
+
+jobs:
+  build:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
+    with:
+      upload_to_pypi: ${{ (github.event_name == 'release') && (github.event.action == 'released') }}
+    secrets:
+      pypi_token: ${{ secrets.PYPI_PASSWORD_STSCI_MAINTAINER }}
+  freeze:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: 
+          [ "ubuntu-latest", "macos-latest" ]
+        python-version:
+          [ "3.11", "3.12" ]
+      fail-fast: false
+    name: freeze versions (Python ${{ matrix.python-version }}, ${{ matrix.os }})
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-name: jwql-${{ runner.os }}-py${{ matrix.python-version }}
+          environment-file: environment.yml
+          create-args: >-
+            python=${{ matrix.python-version }}
+            conda
+          init-shell: none
+          generate-run-shell: true
+      - run: pip install .
+      - run: pip list
+      - id: version
+        uses: mtkennerly/dunamai-action@v1
+        with:
+          args: --strict --pattern "default-unprefixed" --style semver
+      - id: filename
+        run: echo "filename=jwql_${{ steps.version.outputs.version }}_conda_${{ runner.os }}_${{ runner.arch }}_py${{ matrix.python-version }}.yml" >> $GITHUB_OUTPUT
+      - run: conda env export --no-build | grep -v "name:" | grep -v "prefix:" > ${{ steps.filename.outputs.filename }}
+      - run: cat ${{ steps.filename.outputs.filename }}
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ steps.filename.outputs.filename }}
+          path: ${{ steps.filename.outputs.filename }}
+      - if: (github.event_name == 'release' && github.event.action == 'released')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          file: ${{ steps.filename.outputs.filename }}
+            
+
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54147a822..f2f1727ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,15 +1,13 @@
-name: JWQL CI
+name: test
 
-on: [push, pull_request]
+on: 
+  push:
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-defaults:
-  run:
-    shell: bash -l {0}
-
 jobs:
   check:
     runs-on: ubuntu-latest
@@ -17,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.x"
+          python-version: "3.11"
       - run: pip install bandit
       - run: bandit ./jwql/ -c .bandit
 
@@ -25,30 +23,38 @@ jobs:
     name: test (Python ${{ matrix.python-version }}, ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
-      max-parallel: 5
-      fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
-        python-version: [3.9, "3.10"]
-
+        os: [ "ubuntu-latest", "macos-latest" ]
+        python-version: [ "3.11", "3.12" ]
+      fail-fast: false
+    env:
+      PYTHONUNBUFFERED: 1
+    defaults:
+      run:
+        shell: micromamba-shell {0}
     steps:
       - uses: actions/checkout@v4
-
-      - uses: mamba-org/provision-with-micromamba@v15
+      
+      - uses: mamba-org/setup-micromamba@v1
         with:
-          environment-file: ./environment_python_${{ matrix.python-version }}.yml
-          cache-env: true
-          cache-downloads: true
+          environment-name: jwql-${{ runner.os }}-py${{ matrix.python-version }}
+          environment-file: environment.yml
+          create-args: >-
+            python=${{ matrix.python-version }}
+          init-shell: none
+          generate-run-shell: true
+          
+      - run: pip install -e .[test] pytest-xdist
 
-      - run: pip install -e .[test]
+      - run: pip list
 
-      - run: conda env export
+      - run: micromamba env export
 
-      - uses: supercharge/redis-github-action@1.4.0
+      - if: runner.os == 'Linux'
+        uses: supercharge/redis-github-action@1.4.0
         with:
           redis-version: 5.0
-        if: runner.os == 'Linux'
 
       - run: python -c "import jwql; print('Version ' + jwql.__version__); print('Path ' + jwql.__path__[0])"
 
-      - run: pytest jwql/tests/
+      - run: pytest -n auto jwql/tests/
diff --git a/.gitignore b/.gitignore
index 64320a824..a6c451e08 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ jwql/website/apps/jwql/static/filesystem
 jwql/website/apps/jwql/static/outputs
 jwql/website/apps/jwql/static/preview_images
 jwql/website/apps/jwql/static/thumbnails
+jwql-current.yml
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index 069f15a23..82276d712 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -12,10 +12,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.9"
-  jobs:
-    post_install:
-      - pip install sqlalchemy==1.4.46
+    python: "3.11"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
@@ -27,6 +24,7 @@ sphinx:
 # Optionally declare the Python requirements required to build your docs
 python:
    install:
-      - requirements: rtd_requirements.txt
       - method: pip
         path: .
+        extra_requirements:
+           - docs
diff --git a/CHANGES.rst b/CHANGES.rst
index 47c7c630b..f25bfbe6b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,5 +1,40 @@
 ## What's Changed
 
+1.2.9 (2024-07-10)
+==================
+
+Web Application
+~~~~~~~~~~~~~~~
+- Add Download CSV button to query page by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1561
+- show file anomalies on exposure group page by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1564
+- create generic error page to handle exceptions in views. by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1549
+
+Project & API Documentation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- final model define for faking by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1544
+- Update Redis Package Names in Environment Files by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1546
+- [SCSB-145] require Python 3.10 by @zacharyburnett in https://github.com/spacetelescope/jwql/pull/1515
+- debug false by default by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1550
+- Update NIRSpec TA Monitors to use Django DB Models by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1499
+- Update NIRSpec TA Models by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1565
+- Remove codecov.yml by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1588
+- Remove filename parser test over filesystem by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1586
+- Update remote to upstream in pull_jwql_branch.sh by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1591
+- Add Dependencies for Servers in `pyproject.toml` by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1568
+- fix release upload step condition to match workflow trigger by @zacharyburnett in https://github.com/spacetelescope/jwql/pull/1593
+- fix environment freeze workflow not picking up tag by @zacharyburnett in https://github.com/spacetelescope/jwql/pull/1594
+- fix version matching pattern by @zacharyburnett in https://github.com/spacetelescope/jwql/pull/1595
+- updating freeze matrix to include linux, mac and python 3.12 by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1596
+- Remove P750L from list of NIRSpec filters by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1598
+- [build] fix `runs-on:` and update build filename for easier parsing by @zacharyburnett in https://github.com/spacetelescope/jwql/pull/1599
+- upload to PyPI on release by @zacharyburnett in https://github.com/spacetelescope/jwql/pull/1601
+- Updating jwst_reffiles version number by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1606
+- Remove old presentations from repo by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1607
+- Num results fix by @BradleySappington in https://github.com/spacetelescope/jwql/pull/1608
+- Add Environment Update Script by @mfixstsci in https://github.com/spacetelescope/jwql/pull/1609
+- Add new NIRISS AMI-related suffixes by @bhilbert4 in https://github.com/spacetelescope/jwql/pull/1613
+
+
 1.2.8 (2024-04-18)
 ==================
 
diff --git a/README.md b/README.md
index 377005a11..fcfa65b49 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Getting `jwql` up and running on your own computer requires four steps, detailed
 
 ### Prerequisites
 
-It is highly suggested that contributors have a working installation of `anaconda` or `miniconda` for Python 3.9+.  Downloads and installation instructions are  available here:
+It is highly suggested that contributors have a working installation of `anaconda` or `miniconda` for Python 3.10+.  Downloads and installation instructions are  available here:
 
 - [Miniconda](https://conda.io/miniconda.html)
 - [Anaconda](https://www.continuum.io/downloads)
@@ -86,13 +86,13 @@ source activate base/root
 Lastly, create the `jwql` environment via one of the `environment.yml` files (currently `environment_python_3.9.yml`, for python 3.9, and `environment_python_3.10.yml`, for python 3.10, are supported by `jwql`):
 
 ```
-conda env create -f environment_python_3.9.yml
+conda env create -f environment_python_3.10.yml
 ```
 
 or
 
 ```
-conda env create -f environment_python_3.10.yml
+conda env create -f environment_python_3.11.yml
 ```
 
 ### Configuration File
diff --git a/codecov.yml b/codecov.yml
deleted file mode 100644
index 237a28191..000000000
--- a/codecov.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-codecov:
-  notify:
-    require_ci_to_pass: no
-
-coverage:
-  precision: 2
-  round: down
-  range: "0...75"
-
-  status:
-    project: off
-    patch: off
-    changes: off
-
-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no
-
-comment:
-  layout: "header, diff, files"
-  behavior: default
-  require_changes: no
-
-ignore:
-  - "jwql/database/"
-  - "jwql/tests/"
-  - "jwql/instrument_monitors/miri_monitors/data_trending/plots/"
-  - "jwql/instrument_monitors/nirspec_monitors/data_trending/plots/"
-  - "*__init__.py*"
-  - "**/*.html"
-  - "**/*.js"
-  - "**/*.css"
diff --git a/environment.yml b/environment.yml
new file mode 100644
index 000000000..53e6986a7
--- /dev/null
+++ b/environment.yml
@@ -0,0 +1,3 @@
+dependencies:
+  - firefox
+  - python
diff --git a/environment_python_3.10.yml b/environment_python_3.10.yml
deleted file mode 100644
index e322ea9ca..000000000
--- a/environment_python_3.10.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# This file describes a conda environment that can be to install jwql
-#
-# Run the following command to set up this environment:
-# $ conda env create -f environment_python_3.10.yml
-#
-# The environment name can be overridden with the following command:
-# $ conda env create -n <custom name> -f environment_python_3.10.yml
-#
-# Run the following command to activate the environment:
-# $ source activate jwql-3.10
-#
-# To deactivate the environment run the following command:
-# $ source deactivate
-#
-# To remove the environment entirely, run the following command:
-# $ conda env remove -n jwql-3.10
-
-name: jwql-3.10
-
-channels:
-  - conda-forge
-  - defaults
-
-dependencies:
-  - astropy=5.3.4
-  - beautifulsoup4=4.12.2
-  - bokeh=3.3.0
-  - celery=5.3.4
-  - cryptography=41.0.4
-  - django=4.2.6
-  - inflection=0.5.1
-  - ipython=8.16.1
-  - jinja2=3.1.2
-  - jsonschema=4.19.1
-  - matplotlib=3.8.0
-  - nodejs=20.8.0
-  - numpy=1.25.2
-  - numpydoc=1.5.0
-  - pandas=2.1.1
-  - pip=23.2.1
-  - postgresql=15.4
-  - psycopg2=2.9.7
-  - pytest=7.4.2
-  - pytest-cov=4.1.0
-  - pytest-mock=3.11.1
-  - python=3.10.12
-  - pyyaml=6.0.1
-  - redis=5.0.0
-  - ruff=0.0.292
-  - scipy=1.9.3
-  - setuptools=68.2.2
-  - sphinx=7.2.6
-  - sphinx_rtd_theme=1.3.0
-  - sqlalchemy=2.0.21
-  - twine=4.0.2
-  - wtforms=3.0.1
-
-  - pip:
-    - astroquery==0.4.6
-    - bandit==1.7.5
-    - jwst==1.12.3
-    - jwst_backgrounds==1.2.0
-    - pysiaf==0.20.0
-    - pysqlite3==0.5.2
-    - pyvo==1.4.2
-    - redis==5.0.0
-    - selenium==4.13.0
-    - stdatamodels==1.8.3
-    - stsci_rtd_theme==1.0.0
-    - vine==5.0.0
-    - git+https://github.com/spacetelescope/jwst_reffiles
-
-    # Current package
-    - -e .
diff --git a/environment_python_3.9.yml b/environment_python_3.9.yml
deleted file mode 100644
index a68f005c5..000000000
--- a/environment_python_3.9.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# This file describes a conda environment that can be to install jwql
-#
-# Run the following command to set up this environment:
-# $ conda env create -f environment_python_3.9.yml
-#
-# The environment name can be overridden with the following command:
-# $ conda env create -n <custom name> -f environment_python_3.9.yml
-#
-# Run the following command to activate the environment:
-# $ source activate jwql-3.9
-#
-# To deactivate the environment run the following command:
-# $ source deactivate
-#
-# To remove the environment entirely, run the following command:
-# $ conda env remove -n jwql-3.9
-
-name: jwql-3.9
-
-channels:
-  - conda-forge
-  - defaults
-
-dependencies:
-  - astropy=5.3.3
-  - beautifulsoup4=4.12.2
-  - bokeh=3.3.0
-  - celery=5.3.4
-  - cryptography=41.0.4
-  - django=4.2.5
-  - inflection=0.5.1
-  - ipython=8.16.1
-  - jinja2=3.1.2
-  - jsonschema=4.19.1
-  - matplotlib=3.8.0
-  - nodejs=20.8.0
-  - numpy=1.25.2
-  - numpydoc=1.5.0
-  - pandas=2.1.1
-  - pip=23.2.1
-  - postgresql=15.4
-  - psycopg2=2.9.7
-  - pytest=7.4.2
-  - pytest-cov=4.1.0
-  - pytest-mock=3.11.1
-  - python=3.9.17
-  - pyyaml=6.0.1
-  - redis=5.0.0
-  - ruff=0.0.292
-  - scipy=1.9.3
-  - setuptools=68.2.2
-  - sphinx=7.2.6
-  - sphinx_rtd_theme=1.3.0
-  - sqlalchemy=2.0.21
-  - twine=4.0.2
-  - wtforms=3.0.1
-
-  - pip:
-    - astroquery==0.4.6
-    - bandit==1.7.5
-    - jwst==1.12.3
-    - jwst_backgrounds==1.2.0
-    - pysiaf==0.20.0
-    - pysqlite3==0.5.2
-    - pyvo==1.4.2
-    - redis==5.0.0
-    - selenium==4.13.0
-    - stdatamodels==1.8.3
-    - stsci_rtd_theme==1.0.0
-    - vine==5.0.0
-    - git+https://github.com/spacetelescope/jwst_reffiles
-
-    # Current package
-    - -e .
diff --git a/jwql/example_config.json b/jwql/example_config.json
index 95bc8c8cf..41e17be50 100644
--- a/jwql/example_config.json
+++ b/jwql/example_config.json
@@ -28,6 +28,7 @@
             "PORT" : ""
         }
     },
+    "django_debug" : false,
     "jwql_dir" : "",
     "jwql_version": "",
     "server_type": "",
diff --git a/jwql/install-env.sh b/jwql/install-env.sh
new file mode 100644
index 000000000..130f65754
--- /dev/null
+++ b/jwql/install-env.sh
@@ -0,0 +1,70 @@
+branchname=$1
+python_version=$2
+
+printf "UPDATING JWQL ENVIRONMENT\n\n"
+
+# Check operating system to obtain proper substring for environment
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    os_str="macOS_ARM64"
+    printf "INFORMATION: \n \t MAC OS DETECTED, USING MAC ENVIRONMENT FILE\n"
+elif [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    os_str="Linux_X64"
+    printf "INFORMATION: \n \t LINUX OS DETECTED, USING LINUX ENVIRONMENT FILE\n"
+else
+    printf "EXCEPTION: \n \t $OSTYPE NOT SUPPORTED, EXITING"
+    return
+fi
+
+# Check if branch name starts with "v" for our major releases
+# Our branch names contain v prior to version number, but version names on git
+# do not contain v prior to the number.
+if [[ $branchname == v* ]]; then
+    jwql_version=${branchname:1:${#branchname}}
+    environment_url=https://github.com/spacetelescope/jwql/releases/download/$jwql_version/
+    environment_name=jwql_${jwql_version}_conda_${os_str}_py${python_version}
+    environment_filename="${environment_name}.yml"
+else
+    printf "EXCEPTION: \n \t RELEASE DOESNT FOLLOW RELEASE VERSIONING NAMING CONVENTION, EXITING"
+    return
+fi
+
+# Download asset from release and install it.
+if curl --head --silent --fail "${environment_url}${environment_filename}" 2> /dev/null;
+    then
+        # Reset back to base first before generating environment (incase one is currently activated)
+        eval "$(conda shell.bash deactivate)"
+        eval "$(conda shell.bash activate base)"
+        printf "\n SUCESSFULLY LOCATED ENVIRONMENT FILE ${environment_url}${environment_filename} \n"
+        curl -L "${environment_url}/${environment_filename}" > jwql-current.yml
+        $CONDA_EXE env create --name $environment_name --file jwql-current.yml
+    else
+        printf "EXCEPTION:\n"
+        printf "\t ${environment_url}${environment_filename} DOES NOT EXIST, EXITING\n"
+        printf "\t \nENSURE THAT: \n"
+        printf "\t https://github.com/spacetelescope/jwql/releases/tag/$branchname \n"
+        printf "EXISTS AND VERIFY ASSET FOR ${jwql_version}, ${python_version} FOR OS ${os_str}"
+        return
+fi
+
+# Update symlink
+cd ${CONDA_PREFIX}/envs/
+
+env_symlink="jwql-current"
+
+if [[ -L $env_symlink || -e $env_symlink ]]; then
+   printf "INFORMATION:\n"
+   printf "\tjwql-current SYMLINK EXISTS, UNLINKING\n"
+   unlink jwql-current
+fi
+
+printf "INFORMATION:\n\tLINKING NEW ENVIRONMENT\n"
+ln -s $environment_name jwql-current
+
+printf "\tjwql-current HAS BEEN SET TO: ${environment_name}\n"
+printf "\tTO SEE CHANGES, EXIT/RESTART SHELL\n"
+
+# return to original directory
+cd -
+
+# Conda commands change shell prompt, this just returns it to the default
+export PS1="\n(base)\h:\W \u\$ "
diff --git a/jwql/instrument_monitors/nirspec_monitors/ta_monitors/msata_monitor.py b/jwql/instrument_monitors/nirspec_monitors/ta_monitors/msata_monitor.py
index 55abcf95e..c0ea6201c 100755
--- a/jwql/instrument_monitors/nirspec_monitors/ta_monitors/msata_monitor.py
+++ b/jwql/instrument_monitors/nirspec_monitors/ta_monitors/msata_monitor.py
@@ -9,7 +9,7 @@
 #    Sep 2022 - Vr. 1.3: Modified ColumnDataSource so that data could be recovered
 #                        from an html file of a previous run of the monitor and
 #                        included the code to read and format the data from the html file
-
+#    Apr 2024 - Vr. 1.4: Removed html webscraping and now store data in django models
 
 """
 This module contains the code for the NIRSpec Multi Shutter Array Target
@@ -25,6 +25,7 @@
 ______
     - Maria Pena-Guerrero
     - Melanie Clarke
+    - Mees Fix
 
 Use
 ---
@@ -33,13 +34,11 @@
 
 """
 
-
 # general imports
-import json
 import os
 import logging
-import shutil
 from datetime import datetime, timezone, timedelta
+from dateutil import parser
 from random import randint
 
 import numpy as np
@@ -49,24 +48,40 @@
 from bokeh.embed import components
 from bokeh.layouts import gridplot, layout
 from bokeh.models import (
-    ColumnDataSource, Range1d, CustomJS, CustomJSFilter, CDSView,
-    Span, Label, DateRangeSlider)
+    ColumnDataSource,
+    Range1d,
+    CustomJS,
+    CustomJSFilter,
+    CDSView,
+    Span,
+    Label,
+    DateRangeSlider,
+)
 from bokeh.models.tools import HoverTool, BoxSelectTool
 from bokeh.plotting import figure, save, output_file
-from bs4 import BeautifulSoup
-from sqlalchemy.sql.expression import and_
 
 # jwql imports
-from jwql.database.database_interface import session, engine
-from jwql.database.database_interface import NIRSpecTAQueryHistory, NIRSpecTAStats
+from jwql.utils.constants import ON_GITHUB_ACTIONS, ON_READTHEDOCS
 from jwql.utils import monitor_utils
 from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE
 from jwql.utils.logging_functions import log_info, log_fail
 from jwql.utils.utils import ensure_dir_exists, filesystem_path, get_config
 
+if not ON_GITHUB_ACTIONS and not ON_READTHEDOCS:
+    # Need to set up django apps before we can access the models
+    import django  # noqa: E402 (module level import not at top of file)
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jwql.website.jwql_proj.settings")
+    django.setup()
+
+    from jwql.website.apps.jwql.monitor_models.ta import (
+        NIRSpecMsataStats,
+        NIRSpecTaQueryHistory,
+    )  # noqa: E402 (module level import not at top of file)
 
-class MSATA():
-    """ Class for executing the NIRSpec MSATA monitor.
+
+class MSATA:
+    """Class for executing the NIRSpec MSATA monitor.
 
     This class will search for new MSATA current files in the file systems
     for NIRSpec and will run the monitor on these files. The monitor will
@@ -94,50 +109,241 @@ class MSATA():
     """
 
     def __init__(self):
-        """ Initialize an instance of the MSATA class """
+        """Initialize an instance of the MSATA class"""
         # Very beginning of intake of images: Jan 28, 2022 == First JWST images (MIRI)
         self.query_very_beginning = 59607.0
 
+        # Set instrument and aperture
+        self.instrument = "nirspec"
+        self.aperture = "NRS_FULL_MSA"
+
         # dictionary to define required keywords to extract MSATA data and where it lives
-        self.keywds2extract = {'FILENAME': {'loc': 'main_hdr', 'alt_key': None, 'name': 'filename', 'type': str},
-                               'DATE-BEG': {'loc': 'main_hdr', 'alt_key': None, 'name': 'date_obs', 'type': str},
-                               'OBS_ID': {'loc': 'main_hdr', 'alt_key': None, 'name': 'visit_id', 'type': str},
-                               'FILTER': {'loc': 'main_hdr', 'alt_key': 'FWA_POS', 'name': 'tafilter', 'type': str},
-                               'DETECTOR': {'loc': 'main_hdr', 'alt_key': None, 'name': 'detector', 'type': str},
-                               'READOUT': {'loc': 'main_hdr', 'alt_key': 'READPATT', 'name': 'readout', 'type': str},
-                               'SUBARRAY': {'loc': 'main_hdr', 'alt_key': None, 'name': 'subarray', 'type': str},
-                               'NUMREFST': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'num_refstars', 'type': int},
-                               'TASTATUS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'ta_status', 'type': str},
-                               'STAT_RSN': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'status_rsn', 'type': str},
-                               'V2HFOFFS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'v2halffacet', 'type': float},
-                               'V3HFOFFS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'v3halffacet', 'type': float},
-                               'V2MSACTR': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'v2msactr', 'type': float},
-                               'V3MSACTR': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'v3msactr', 'type': float},
-                               'FITXOFFS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsv2offset', 'type': float},
-                               'FITYOFFS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsv3offset', 'type': float},
-                               'OFFSTMAG': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsoffsetmag', 'type': float},
-                               'FITROFFS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsrolloffset', 'type': float},
-                               'FITXSIGM': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsv2sigma', 'type': float},
-                               'FITYSIGM': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsv3sigma', 'type': float},
-                               'ITERATNS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'lsiterations', 'type': int},
-                               'GUIDERID': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'guidestarid', 'type': str},
-                               'IDEAL_X': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'guidestarx', 'type': float},
-                               'IDEAL_Y': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'guidestary', 'type': float},
-                               'IDL_ROLL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'guidestarroll', 'type': float},
-                               'SAM_X': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'samx', 'type': float},
-                               'SAM_Y': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'samy', 'type': float},
-                               'SAM_ROLL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'samroll', 'type': float},
-                               'box_peak_value': {'loc': 'ta_table', 'alt_key': None, 'name': 'box_peak_value', 'type': float},
-                               'reference_star_mag': {'loc': 'ta_table', 'alt_key': None, 'name': 'reference_star_mag', 'type': float},
-                               'convergence_status': {'loc': 'ta_table', 'alt_key': None, 'name': 'convergence_status', 'type': str},
-                               'reference_star_number': {'loc': 'ta_table', 'alt_key': None, 'name': 'reference_star_number', 'type': int},
-                               'lsf_removed_status': {'loc': 'ta_table', 'alt_key': None, 'name': 'lsf_removed_status', 'type': str},
-                               'lsf_removed_reason': {'loc': 'ta_table', 'alt_key': None, 'name': 'lsf_removed_reason', 'type': str},
-                               'lsf_removed_x': {'loc': 'ta_table', 'alt_key': None, 'name': 'lsf_removed_x', 'type': float},
-                               'lsf_removed_y': {'loc': 'ta_table', 'alt_key': None, 'name': 'lsf_removed_y', 'type': float},
-                               'planned_v2': {'loc': 'ta_table', 'alt_key': None, 'name': 'planned_v2', 'type': float},
-                               'planned_v3': {'loc': 'ta_table', 'alt_key': None, 'name': 'planned_v3', 'type': float},
-                               'FITTARGS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'stars_in_fit', 'type': int}}
+        self.keywds2extract = {
+            "FILENAME": {
+                "loc": "main_hdr",
+                "alt_key": None,
+                "name": "filename",
+                "type": str,
+            },
+            "DATE-BEG": {
+                "loc": "main_hdr",
+                "alt_key": None,
+                "name": "date_obs",
+                "type": str,
+            },
+            "OBS_ID": {
+                "loc": "main_hdr",
+                "alt_key": None,
+                "name": "visit_id",
+                "type": str,
+            },
+            "FILTER": {
+                "loc": "main_hdr",
+                "alt_key": "FWA_POS",
+                "name": "tafilter",
+                "type": str,
+            },
+            "DETECTOR": {
+                "loc": "main_hdr",
+                "alt_key": None,
+                "name": "detector",
+                "type": str,
+            },
+            "READOUT": {
+                "loc": "main_hdr",
+                "alt_key": "READPATT",
+                "name": "readout",
+                "type": str,
+            },
+            "SUBARRAY": {
+                "loc": "main_hdr",
+                "alt_key": None,
+                "name": "subarray",
+                "type": str,
+            },
+            "NUMREFST": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "num_refstars",
+                "type": int,
+            },
+            "TASTATUS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "ta_status",
+                "type": str,
+            },
+            "STAT_RSN": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "status_rsn",
+                "type": str,
+            },
+            "V2HFOFFS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "v2halffacet",
+                "type": float,
+            },
+            "V3HFOFFS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "v3halffacet",
+                "type": float,
+            },
+            "V2MSACTR": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "v2msactr",
+                "type": float,
+            },
+            "V3MSACTR": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "v3msactr",
+                "type": float,
+            },
+            "FITXOFFS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsv2offset",
+                "type": float,
+            },
+            "FITYOFFS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsv3offset",
+                "type": float,
+            },
+            "OFFSTMAG": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsoffsetmag",
+                "type": float,
+            },
+            "FITROFFS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsrolloffset",
+                "type": float,
+            },
+            "FITXSIGM": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsv2sigma",
+                "type": float,
+            },
+            "FITYSIGM": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsv3sigma",
+                "type": float,
+            },
+            "ITERATNS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "lsiterations",
+                "type": int,
+            },
+            "GUIDERID": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "guidestarid",
+                "type": str,
+            },
+            "IDEAL_X": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "guidestarx",
+                "type": float,
+            },
+            "IDEAL_Y": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "guidestary",
+                "type": float,
+            },
+            "IDL_ROLL": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "guidestarroll",
+                "type": float,
+            },
+            "SAM_X": {"loc": "ta_hdr", "alt_key": None, "name": "samx", "type": float},
+            "SAM_Y": {"loc": "ta_hdr", "alt_key": None, "name": "samy", "type": float},
+            "SAM_ROLL": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "samroll",
+                "type": float,
+            },
+            "box_peak_value": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "box_peak_value",
+                "type": float,
+            },
+            "reference_star_mag": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "reference_star_mag",
+                "type": float,
+            },
+            "convergence_status": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "convergence_status",
+                "type": str,
+            },
+            "reference_star_number": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "reference_star_number",
+                "type": int,
+            },
+            "lsf_removed_status": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "lsf_removed_status",
+                "type": str,
+            },
+            "lsf_removed_reason": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "lsf_removed_reason",
+                "type": str,
+            },
+            "lsf_removed_x": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "lsf_removed_x",
+                "type": float,
+            },
+            "lsf_removed_y": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "lsf_removed_y",
+                "type": float,
+            },
+            "planned_v2": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "planned_v2",
+                "type": float,
+            },
+            "planned_v3": {
+                "loc": "ta_table",
+                "alt_key": None,
+                "name": "planned_v3",
+                "type": float,
+            },
+            "FITTARGS": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "stars_in_fit",
+                "type": int,
+            },
+        }
 
         # initialize attributes to be set later
         self.source = None
@@ -147,7 +353,7 @@ def __init__(self):
         self.date_view = None
 
     def get_tainfo_from_fits(self, fits_file):
-        """ Get the TA information from the fits file
+        """Get the TA information from the fits file
         Parameters
         ----------
         fits_file: str
@@ -161,23 +367,23 @@ def get_tainfo_from_fits(self, fits_file):
         with fits.open(fits_file) as ff:
             # make sure this is a MSATA file
             for hdu in ff:
-                if 'MSA_TARG_ACQ' in hdu.name:
+                if "MSA_TARG_ACQ" in hdu.name:
                     msata = True
                     break
             if not msata:
                 return None
             main_hdr = ff[0].header
             try:
-                ta_hdr = ff['MSA_TARG_ACQ'].header
-                ta_table = ff['MSA_TARG_ACQ'].data
+                ta_hdr = ff["MSA_TARG_ACQ"].header
+                ta_table = ff["MSA_TARG_ACQ"].data
             except KeyError:
-                no_ta_ext_msg = 'No TARG_ACQ extension in file '+fits_file
+                no_ta_ext_msg = "No TARG_ACQ extension in file " + fits_file
                 return no_ta_ext_msg
         msata_info = [main_hdr, ta_hdr, ta_table]
         return msata_info
 
     def get_msata_data(self, new_filenames):
-        """ Get the TA information from the MSATA text table
+        """Get the TA information from the MSATA text table
         Parameters
         ----------
         new_filenames: list
@@ -200,28 +406,30 @@ def get_msata_data(self, new_filenames):
             main_hdr, ta_hdr, ta_table = msata_info
             file_data_dict, file_errs = {}, []
             for key, key_dict in self.keywds2extract.items():
-                key_name = key_dict['name']
+                key_name = key_dict["name"]
                 if key_name not in file_data_dict:
                     file_data_dict[key_name] = []
                 ext = main_hdr
-                if key_dict['loc'] == 'ta_hdr':
+                if key_dict["loc"] == "ta_hdr":
                     ext = ta_hdr
-                if key_dict['loc'] == 'ta_table':
+                if key_dict["loc"] == "ta_table":
                     ext = ta_table
                 try:
                     val = ext[key]
-                    if key == 'filename':
+                    if key == "filename":
                         val = fits_file
                 except KeyError:
-                    if key_dict['alt_key'] is not None:
+                    if key_dict["alt_key"] is not None:
                         try:
-                            val = ext[key_dict['alt_key']]
+                            val = ext[key_dict["alt_key"]]
                         except (NameError, TypeError) as error:
-                            msg = error+' in file '+fits_file
+                            msg = error + " in file " + fits_file
                             file_errs.append(msg)
                             break
                     else:
-                        msg = 'Keyword '+key+' not found. Skipping file '+fits_file
+                        msg = (
+                            "Keyword " + key + " not found. Skipping file " + fits_file
+                        )
                         file_errs.append(msg)
                         break
                 """ UNCOMMENT THIS BLOCK IN CASE WE DO WANT TO GET RID OF the 999.0 values
@@ -243,7 +451,9 @@ def get_msata_data(self, new_filenames):
                 # if msata_dict is not empty then extend the lists
                 else:
                     for msata_dict_key in msata_dict:
-                        msata_dict[msata_dict_key].extend(file_data_dict[msata_dict_key])
+                        msata_dict[msata_dict_key].extend(
+                            file_data_dict[msata_dict_key]
+                        )
             else:
                 no_ta_ext_msgs.extend(file_errs)
         # create the pandas dataframe
@@ -252,19 +462,17 @@ def get_msata_data(self, new_filenames):
 
     def add_time_column(self):
         """Add time column to data source, to be used by all plots."""
-        date_obs = self.source.data['date_obs']
-        if 'time_arr' not in self.source.data:
-            time_arr = []
-            for do_str in date_obs:
-                # convert time string into an array of time (this is in UT)
-                t = datetime.fromisoformat(do_str)
-                time_arr.append(t)
+        date_obs = self.source.data["date_obs"].astype(str)
+        time_arr = [self.add_timezone(do_str) for do_str in date_obs]
+        self.source.data["time_arr"] = time_arr
 
-            # add to the bokeh data structure
-            self.source.data["time_arr"] = time_arr
+    def add_timezone(self, date_str):
+        """Method to bypass timezone warning from Django"""
+        dt_timezone = parser.parse(date_str).replace(tzinfo=timezone.utc)
+        return dt_timezone
 
     def plt_status(self):
-        """ Plot the MSATA status versus time.
+        """Plot the MSATA status versus time.
         Parameters
         ----------
             None
@@ -272,44 +480,58 @@ def plt_status(self):
         -------
             plot: bokeh plot object
         """
-        ta_status = self.source.data['ta_status']
+        ta_status = self.source.data["ta_status"]
         # check if this column exists in the data already (the other 2 will exist too), else create it
-        if 'bool_status' not in self.source.data:
+        if "bool_status" not in self.source.data:
             # bokeh does not like to plot strings, turn into numbers
             number_status, status_colors = [], []
             for tas in ta_status:
-                if tas.lower() == 'unsuccessful':
+                if tas.lower() == "unsuccessful":
                     number_status.append(0.0)
-                    status_colors.append('red')
-                elif 'progress' in tas.lower():
+                    status_colors.append("red")
+                elif "progress" in tas.lower():
                     number_status.append(0.5)
-                    status_colors.append('gray')
+                    status_colors.append("gray")
                 else:
                     number_status.append(1.0)
-                    status_colors.append('blue')
+                    status_colors.append("blue")
 
             # add these to the bokeh data structure
             self.source.data["number_status"] = number_status
             self.source.data["status_colors"] = status_colors
 
         # create a new bokeh plot
-        plot = figure(title="MSATA Status [Success=1, In Progress=0.5, Fail=0]", x_axis_label='Time',
-                      y_axis_label='MSATA Status', x_axis_type='datetime',)
+        plot = figure(
+            title="MSATA Status [Success=1, In Progress=0.5, Fail=0]",
+            x_axis_label="Time",
+            y_axis_label="MSATA Status",
+            x_axis_type="datetime",
+        )
         plot.y_range = Range1d(-0.5, 1.5)
-        plot.circle(x='time_arr', y='number_status', source=self.source,
-                    color='status_colors', size=7, fill_alpha=0.3, view=self.date_view)
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="number_status",
+            source=self.source,
+            color="status_colors",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -318,7 +540,7 @@ def plt_status(self):
         return plot
 
     def plt_residual_offsets(self):
-        """ Plot the residual Least Squares V2 and V3 offsets
+        """Plot the residual Least Squares V2 and V3 offsets
         Parameters
         ----------
             None
@@ -327,41 +549,72 @@ def plt_residual_offsets(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares Residual V2-V3 Offsets",
-                      x_axis_label='Least Squares Residual V2 Offset',
-                      y_axis_label='Least Squares Residual V3 Offset')
-        plot.circle(x='lsv2offset', y='lsv3offset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
-
-        v2halffacet, v3halffacet = self.source.data['v2halffacet'], self.source.data['v3halffacet']
+        plot = figure(
+            title="MSATA Least Squares Residual V2-V3 Offsets",
+            x_axis_label="Least Squares Residual V2 Offset",
+            y_axis_label="Least Squares Residual V3 Offset",
+        )
+        plot.scatter(
+            marker="circle",
+            x="lsv2offset",
+            y="lsv3offset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
+
+        v2halffacet, v3halffacet = (
+            self.source.data["v2halffacet"],
+            self.source.data["v3halffacet"],
+        )
         xstart, ystart, ray_length = -1 * v2halffacet[0], -1 * v3halffacet[0], 0.05
-        plot.ray(x=xstart - ray_length / 2.0, y=ystart, length=ray_length, angle_units="deg",
-                 angle=0, line_color='purple', line_width=3)
-        plot.ray(x=xstart, y=ystart - ray_length / 2.0, length=ray_length, angle_units="deg",
-                 angle=90, line_color='purple', line_width=3)
-        hflabel = Label(x=xstart / 3.0, y=ystart, y_units='data', text='-V2, -V3 half-facets values')
+        plot.ray(
+            x=xstart - ray_length / 2.0,
+            y=ystart,
+            length=ray_length,
+            angle_units="deg",
+            angle=0,
+            line_color="purple",
+            line_width=3,
+        )
+        plot.ray(
+            x=xstart,
+            y=ystart - ray_length / 2.0,
+            length=ray_length,
+            angle_units="deg",
+            angle=90,
+            line_color="purple",
+            line_width=3,
+        )
+        hflabel = Label(
+            x=xstart / 3.0, y=ystart, y_units="data", text="-V2, -V3 half-facets values"
+        )
         plot.add_layout(hflabel)
         plot.x_range = Range1d(-0.5, 0.5)
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin lines
-        vline = Span(location=0, dimension='height', line_color='black', line_width=0.7)
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        vline = Span(location=0, dimension="height", line_color="black", line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([vline, hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -370,7 +623,7 @@ def plt_residual_offsets(self):
         return plot
 
     def plt_v2offset_time(self):
-        """ Plot the residual V2 versus time
+        """Plot the residual V2 versus time
         Parameters
         ----------
             None
@@ -379,33 +632,60 @@ def plt_v2offset_time(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares V2 Offset vs Time", x_axis_label='Time',
-                      y_axis_label='Least Squares Residual V2 Offset', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='lsv2offset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares V2 Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Least Squares Residual V2 Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="lsv2offset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
-        time_arr, v2halffacet = self.source.data['time_arr'], self.source.data['v2halffacet']
-        hfline = Span(location=-1 * v2halffacet[0], dimension='width', line_color='green', line_width=3)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
+        time_arr, v2halffacet = (
+            self.source.data["time_arr"],
+            self.source.data["v2halffacet"],
+        )
+        hfline = Span(
+            location=-1 * v2halffacet[0],
+            dimension="width",
+            line_color="green",
+            line_width=3,
+        )
         plot.renderers.extend([hline, hfline])
-        hflabel = Label(x=time_arr[-1], y=-1 * v2halffacet[0], y_units='data', text='-V2 half-facet value')
+        hflabel = Label(
+            x=time_arr[-1],
+            y=-1 * v2halffacet[0],
+            y_units="data",
+            text="-V2 half-facet value",
+        )
         plot.add_layout(hflabel)
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -414,7 +694,7 @@ def plt_v2offset_time(self):
         return plot
 
     def plt_v3offset_time(self):
-        """ Plot the residual V3 versus time
+        """Plot the residual V3 versus time
         Parameters
         ----------
             None
@@ -423,33 +703,60 @@ def plt_v3offset_time(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares V3 Offset vs Time", x_axis_label='Time',
-                      y_axis_label='Least Squares Residual V3 Offset', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='lsv3offset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares V3 Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Least Squares Residual V3 Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="lsv3offset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
-        time_arr, v3halffacet = self.source.data['time_arr'], self.source.data['v3halffacet']
-        hfline = Span(location=-1 * v3halffacet[0], dimension='width', line_color='green', line_width=3)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
+        time_arr, v3halffacet = (
+            self.source.data["time_arr"],
+            self.source.data["v3halffacet"],
+        )
+        hfline = Span(
+            location=-1 * v3halffacet[0],
+            dimension="width",
+            line_color="green",
+            line_width=3,
+        )
         plot.renderers.extend([hline, hfline])
-        hflabel = Label(x=time_arr[-1], y=-1 * v3halffacet[0], y_units='data', text='-V3 half-facet value')
+        hflabel = Label(
+            x=time_arr[-1],
+            y=-1 * v3halffacet[0],
+            y_units="data",
+            text="-V3 half-facet value",
+        )
         plot.add_layout(hflabel)
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -458,7 +765,7 @@ def plt_v3offset_time(self):
         return plot
 
     def plt_lsv2v3offsetsigma(self):
-        """ Plot the residual Least Squares V2 and V3 sigma offsets
+        """Plot the residual Least Squares V2 and V3 sigma offsets
         Parameters
         ----------
             None
@@ -467,34 +774,46 @@ def plt_lsv2v3offsetsigma(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares Residual V2-V3 Sigma Offsets",
-                      x_axis_label='Least Squares Residual V2 Sigma Offset',
-                      y_axis_label='Least Squares Residual V3 Sigma Offset')
-        plot.circle(x='lsv2sigma', y='lsv3sigma', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares Residual V2-V3 Sigma Offsets",
+            x_axis_label="Least Squares Residual V2 Sigma Offset",
+            y_axis_label="Least Squares Residual V3 Sigma Offset",
+        )
+        plot.scatter(
+            marker="circle",
+            x="lsv2sigma",
+            y="lsv3sigma",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.x_range = Range1d(-0.1, 0.1)
         plot.y_range = Range1d(-0.1, 0.1)
 
         # mark origin lines
-        vline = Span(location=0, dimension='height', line_color='black', line_width=0.7)
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        vline = Span(location=0, dimension="height", line_color="black", line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([vline, hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V2 sigma', '@lsv2sigma'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('LS V3 sigma', '@lsv3sigma'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V2 sigma", "@lsv2sigma"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("LS V3 sigma", "@lsv3sigma"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -503,7 +822,7 @@ def plt_lsv2v3offsetsigma(self):
         return plot
 
     def plt_res_offsets_corrected(self):
-        """ Plot the residual Least Squares V2 and V3 offsets corrected by the half-facet
+        """Plot the residual Least Squares V2 and V3 offsets corrected by the half-facet
         Parameters
         ----------
             None
@@ -511,11 +830,17 @@ def plt_res_offsets_corrected(self):
         -------
             plot: bokeh plot object
         """
-        lsv2offset, lsv3offset = self.source.data['lsv2offset'], self.source.data['lsv3offset']
-        v2halffacet, v3halffacet = self.source.data['v2halffacet'], self.source.data['v3halffacet']
+        lsv2offset, lsv3offset = (
+            self.source.data["lsv2offset"],
+            self.source.data["lsv3offset"],
+        )
+        v2halffacet, v3halffacet = (
+            self.source.data["v2halffacet"],
+            self.source.data["v3halffacet"],
+        )
 
         # check if this column exists in the data already, else create it
-        if 'v2_half_fac_corr' not in self.source.data:
+        if "v2_half_fac_corr" not in self.source.data:
             v2_half_fac_corr, v3_half_fac_corr = [], []
             for idx, v2hf in enumerate(v2halffacet):
                 v3hf = v3halffacet[idx]
@@ -527,41 +852,69 @@ def plt_res_offsets_corrected(self):
             self.source.data["v3_half_fac_corr"] = v3_half_fac_corr
 
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares Residual V2-V3 Offsets Half-facet corrected",
-                      x_axis_label='Least Squares Residual V2 Offset + half-facet',
-                      y_axis_label='Least Squares Residual V3 Offset + half-facet')
-        plot.circle(x='v2_half_fac_corr', y='v3_half_fac_corr', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares Residual V2-V3 Offsets Half-facet corrected",
+            x_axis_label="Least Squares Residual V2 Offset + half-facet",
+            y_axis_label="Least Squares Residual V3 Offset + half-facet",
+        )
+        plot.scatter(
+            marker="circle",
+            x="v2_half_fac_corr",
+            y="v3_half_fac_corr",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.x_range = Range1d(-0.5, 0.5)
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin lines
-        vline = Span(location=0, dimension='height', line_color='black', line_width=0.7)
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        vline = Span(location=0, dimension="height", line_color="black", line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([vline, hline])
         xstart, ystart, ray_length = -1 * v2halffacet[0], -1 * v3halffacet[0], 0.05
-        plot.ray(x=xstart - ray_length / 2.0, y=ystart, length=ray_length, angle_units="deg",
-                 angle=0, line_color='purple', line_width=3)
-        plot.ray(x=xstart, y=ystart - ray_length / 2.0, length=ray_length, angle_units="deg",
-                 angle=90, line_color='purple', line_width=3)
-        hflabel = Label(x=xstart / 3.0, y=ystart, y_units='data', text='-V2, -V3 half-facets values')
+        plot.ray(
+            x=xstart - ray_length / 2.0,
+            y=ystart,
+            length=ray_length,
+            angle_units="deg",
+            angle=0,
+            line_color="purple",
+            line_width=3,
+        )
+        plot.ray(
+            x=xstart,
+            y=ystart - ray_length / 2.0,
+            length=ray_length,
+            angle_units="deg",
+            angle=90,
+            line_color="purple",
+            line_width=3,
+        )
+        hflabel = Label(
+            x=xstart / 3.0, y=ystart, y_units="data", text="-V2, -V3 half-facets values"
+        )
         plot.add_layout(hflabel)
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('V2 half-facet', '@v2halffacet'),
-                          ('V3 half-facet', '@v3halffacet'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("V2 half-facet", "@v2halffacet"),
+            ("V3 half-facet", "@v3halffacet"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -577,28 +930,42 @@ def plt_v2offsigma_time(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares V2 Sigma Offset vs Time", x_axis_label='Time',
-                      y_axis_label='Least Squares Residual V2 Sigma Offset', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='lsv2sigma', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares V2 Sigma Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Least Squares Residual V2 Sigma Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="lsv2sigma",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.1, 0.1)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V2 sigma', '@lsv2sigma'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V2 sigma", "@lsv2sigma"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -614,31 +981,43 @@ def plt_v3offsigma_time(self):
             p: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares V3 Sigma Offset vs Time",
-                      x_axis_label='Time',
-                      y_axis_label='Least Squares Residual V3 Sigma Offset',
-                      x_axis_type='datetime')
-        plot.circle(x='time_arr', y='lsv3sigma', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares V3 Sigma Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Least Squares Residual V3 Sigma Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="lsv3sigma",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.1, 0.1)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('LS V3 sigma', '@lsv3sigma'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("LS V3 sigma", "@lsv3sigma"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -647,7 +1026,7 @@ def plt_v3offsigma_time(self):
         return plot
 
     def plt_roll_offset(self):
-        """ Plot the residual Least Squares roll Offset versus time
+        """Plot the residual Least Squares roll Offset versus time
         Parameters
         ----------
             None
@@ -656,36 +1035,54 @@ def plt_roll_offset(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares Roll Offset vs Time", x_axis_label='Time',
-                      y_axis_label='Least Squares Residual Roll Offset', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='lsrolloffset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares Roll Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Least Squares Residual Roll Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="lsrolloffset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-600.0, 600.0)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
 
         # Maximum accepted roll line and label
-        time_arr = self.source.data['time_arr']
-        arlinepos = Span(location=120, dimension='width', line_color='green', line_width=3)
-        arlineneg = Span(location=-120, dimension='width', line_color='green', line_width=3)
-        arlabel = Label(x=time_arr[-1], y=125, y_units='data', text='Max accepted roll')
+        time_arr = self.source.data["time_arr"]
+        arlinepos = Span(
+            location=120, dimension="width", line_color="green", line_width=3
+        )
+        arlineneg = Span(
+            location=-120, dimension="width", line_color="green", line_width=3
+        )
+        arlabel = Label(x=time_arr[-1], y=125, y_units="data", text="Max accepted roll")
         plot.add_layout(arlabel)
         plot.renderers.extend([hline, arlinepos, arlineneg])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -694,7 +1091,7 @@ def plt_roll_offset(self):
         return plot
 
     def plt_lsoffsetmag(self):
-        """ Plot the residual Least Squares Total Slew Magnitude Offset versus time
+        """Plot the residual Least Squares Total Slew Magnitude Offset versus time
         Parameters
         ----------
             None
@@ -703,30 +1100,44 @@ def plt_lsoffsetmag(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="MSATA Least Squares Total Magnitude of the Linear V2, V3 Offset Slew vs Time", x_axis_label='Time',
-                      y_axis_label='sqrt((V2_off)**2 + (V3_off)**2)', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='lsoffsetmag', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="MSATA Least Squares Total Magnitude of the Linear V2, V3 Offset Slew vs Time",
+            x_axis_label="Time",
+            y_axis_label="sqrt((V2_off)**2 + (V3_off)**2)",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="lsoffsetmag",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS slew mag offset', '@lsoffsetmag'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS slew mag offset", "@lsoffsetmag"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -735,7 +1146,7 @@ def plt_lsoffsetmag(self):
         return plot
 
     def plt_tot_number_of_stars(self):
-        """ Plot the total number of stars used versus time
+        """Plot the total number of stars used versus time
         Parameters
         ----------
             None
@@ -744,18 +1155,18 @@ def plt_tot_number_of_stars(self):
             plot: bokeh plot object
         """
         # get the number of stars per array
-        visit_id = self.source.data['visit_id']
-        reference_star_number = self.source.data['reference_star_number']
+        visit_id = self.source.data["visit_id"]
+        reference_star_number = self.source.data["reference_star_number"]
 
         # check if this column exists in the data already, else create it
-        if 'tot_number_of_stars' not in self.source.data:
+        if "tot_number_of_stars" not in self.source.data:
             # create the list of color per visit and tot_number_of_stars
             colors_list, tot_number_of_stars = [], []
             color_dict = {}
             for i, vid in enumerate(visit_id):
                 tot_stars = len(reference_star_number[i])
                 tot_number_of_stars.append(tot_stars)
-                ci = '#%06X' % randint(0, 0xFFFFFF)
+                ci = "#%06X" % randint(0, 0xFFFFFF)
                 if vid not in color_dict:
                     color_dict[vid] = ci
                 colors_list.append(color_dict[vid])
@@ -765,35 +1176,57 @@ def plt_tot_number_of_stars(self):
             self.source.data["colors_list"] = colors_list
 
         # create a new bokeh plot
-        plot = figure(title="Total Number of Measurements vs Time", x_axis_label='Time',
-                      y_axis_label='Total number of measurements', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='tot_number_of_stars', source=self.source,
-                    color='colors_list', size=7, fill_alpha=0.3, view=self.date_view)
-        plot.triangle(x='time_arr', y='stars_in_fit', source=self.source,
-                      color='black', size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="Total Number of Measurements vs Time",
+            x_axis_label="Time",
+            y_axis_label="Total number of measurements",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="tot_number_of_stars",
+            source=self.source,
+            color="colors_list",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
+        plot.scatter(
+            marker="triangle",
+            x="time_arr",
+            y="stars_in_fit",
+            source=self.source,
+            color="black",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(0.0, 40.0)
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('Detector', '@detector'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Subarray', '@subarray'),
-                          ('Stars in fit', '@stars_in_fit'),
-                          ('LS roll offset', '@lsrolloffset'),
-                          ('LS slew mag offset', '@lsoffsetmag'),
-                          ('LS V2 offset', '@lsv2offset'),
-                          ('LS V3 offset', '@lsv3offset'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("Detector", "@detector"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Subarray", "@subarray"),
+            ("Stars in fit", "@stars_in_fit"),
+            ("LS roll offset", "@lsrolloffset"),
+            ("LS slew mag offset", "@lsoffsetmag"),
+            ("LS V2 offset", "@lsv2offset"),
+            ("LS V3 offset", "@lsv3offset"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         return plot
 
     def plt_mags_time(self):
-        """ Plot the star magnitudes versus time
+        """Plot the star magnitudes versus time
         Parameters
         ----------
             source: bokeh data object for plotting
@@ -801,19 +1234,19 @@ def plt_mags_time(self):
         -------
             plot: bokeh plot object
         """
-        visit_id = self.source.data['visit_id']
-        lsf_removed_status = self.source.data['lsf_removed_status']
-        lsf_removed_reason = self.source.data['lsf_removed_reason']
-        lsf_removed_x = self.source.data['lsf_removed_x']
-        lsf_removed_y = self.source.data['lsf_removed_y']
-        planned_v2 = self.source.data['planned_v2']
-        planned_v3 = self.source.data['planned_v3']
-        reference_star_number = self.source.data['reference_star_number']
-        box_peak_value = self.source.data['box_peak_value']
-        date_obs, time_arr = self.source.data['date_obs'], self.source.data['time_arr']
-        colors_list = self.source.data['colors_list']
-        detector_list = self.source.data['detector']
-        filename = self.source.data['filename']
+        visit_id = self.source.data["visit_id"]
+        lsf_removed_status = self.source.data["lsf_removed_status"]
+        lsf_removed_reason = self.source.data["lsf_removed_reason"]
+        lsf_removed_x = self.source.data["lsf_removed_x"]
+        lsf_removed_y = self.source.data["lsf_removed_y"]
+        planned_v2 = self.source.data["planned_v2"]
+        planned_v3 = self.source.data["planned_v3"]
+        reference_star_number = self.source.data["reference_star_number"]
+        box_peak_value = self.source.data["box_peak_value"]
+        date_obs, time_arr = self.source.data["date_obs"], self.source.data["time_arr"]
+        colors_list = self.source.data["colors_list"]
+        detector_list = self.source.data["detector"]
+        filename = self.source.data["filename"]
 
         # create the structure matching the number of visits and reference stars
         new_colors_list, vid, dobs, tarr, star_no, status = [], [], [], [], [], []
@@ -827,8 +1260,8 @@ def plt_mags_time(self):
                 c.append(colors_list[i])
                 dt.append(detector_list[i])
                 fn.append(filename[i])
-                if 'not_removed' in lsf_removed_status[i][j]:
-                    s.append('SUCCESS')
+                if "not_removed" in lsf_removed_status[i][j]:
+                    s.append("SUCCESS")
                     x.append(planned_v2[i][j])
                     y.append(planned_v3[i][j])
                 else:
@@ -848,35 +1281,62 @@ def plt_mags_time(self):
             fnames.extend(fn)
 
         # now create the mini ColumnDataSource for this particular plot
-        mini_source = {'vid': vid, 'star_no': star_no, 'status': status,
-                       'dobs': dobs, 'time_arr': tarr, 'det': det, 'fname': fnames,
-                       'peaks': peaks, 'colors_list': new_colors_list,
-                       'stars_v2': stars_v2, 'stars_v3': stars_v3}
+        mini_source = {
+            "vid": vid,
+            "star_no": star_no,
+            "status": status,
+            "dobs": dobs,
+            "time_arr": tarr,
+            "det": det,
+            "fname": fnames,
+            "peaks": peaks,
+            "colors_list": new_colors_list,
+            "stars_v2": stars_v2,
+            "stars_v3": stars_v3,
+        }
         mini_source = ColumnDataSource(data=mini_source)
 
         # hook up the date range slider to this source as well
-        callback = CustomJS(args=dict(s=mini_source), code="""
+        callback = CustomJS(
+            args=dict(s=mini_source),
+            code="""
             s.change.emit();
-        """)
-        self.date_range.js_on_change('value', callback)
-        mini_view = CDSView(source=mini_source, filters=[self.date_filter])
+        """,
+        )
+        self.date_range.js_on_change("value", callback)
+        mini_view = CDSView(filters=[self.date_filter])
 
         # create the bokeh plot
-        plot = figure(title="MSATA Counts vs Time", x_axis_label='Time',
-                      y_axis_label='box_peak [Counts]',
-                      x_axis_type='datetime')
-        plot.circle(x='time_arr', y='peaks', source=mini_source,
-                    color='colors_list', size=7, fill_alpha=0.3, view=mini_view)
+        plot = figure(
+            title="MSATA Counts vs Time",
+            x_axis_label="Time",
+            y_axis_label="box_peak [Counts]",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="peaks",
+            source=mini_source,
+            color="colors_list",
+            size=7,
+            fill_alpha=0.3,
+            view=mini_view,
+        )
 
         # add count saturation warning lines
         loc1, loc2, loc3 = 45000.0, 50000.0, 60000.0
-        hline1 = Span(location=loc1, dimension='width', line_color='green', line_width=3)
-        hline2 = Span(location=loc2, dimension='width', line_color='yellow', line_width=3)
-        hline3 = Span(location=loc3, dimension='width', line_color='red', line_width=3)
+        hline1 = Span(
+            location=loc1, dimension="width", line_color="green", line_width=3
+        )
+        hline2 = Span(
+            location=loc2, dimension="width", line_color="yellow", line_width=3
+        )
+        hline3 = Span(location=loc3, dimension="width", line_color="red", line_width=3)
         plot.renderers.extend([hline1, hline2, hline3])
-        label1 = Label(x=time_arr[-1], y=loc1, y_units='data', text='45000 counts')
-        label2 = Label(x=time_arr[-1], y=loc2, y_units='data', text='50000 counts')
-        label3 = Label(x=time_arr[-1], y=loc3, y_units='data', text='60000 counts')
+        label1 = Label(x=time_arr[-1], y=loc1, y_units="data", text="45000 counts")
+        label2 = Label(x=time_arr[-1], y=loc2, y_units="data", text="50000 counts")
+        label3 = Label(x=time_arr[-1], y=loc3, y_units="data", text="60000 counts")
         plot.add_layout(label1)
         plot.add_layout(label2)
         plot.add_layout(label3)
@@ -884,16 +1344,18 @@ def plt_mags_time(self):
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@fname'),
-                          ('Visit ID', '@vid'),
-                          ('Detector', '@det'),
-                          ('Star No.', '@star_no'),
-                          ('LS Status', '@status'),
-                          ('Date-Obs', '@dobs'),
-                          ('Box peak', '@peaks'),
-                          ('Measured V2', '@stars_v2'),
-                          ('Measured V3', '@stars_v3'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@fname"),
+            ("Visit ID", "@vid"),
+            ("Detector", "@det"),
+            ("Star No.", "@star_no"),
+            ("LS Status", "@status"),
+            ("Date-Obs", "@dobs"),
+            ("Box peak", "@peaks"),
+            ("Measured V2", "@stars_v2"),
+            ("Measured V3", "@stars_v3"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         return plot
@@ -902,8 +1364,8 @@ def setup_date_range(self):
         """Set up a date range filter, defaulting to the last week of data."""
         end_date = datetime.now(tz=timezone.utc)
         one_week_ago = end_date.date() - timedelta(days=7)
-        first_data_point = np.min(self.source.data['time_arr']).date()
-        last_data_point = np.max(self.source.data['time_arr']).date()
+        first_data_point = np.min(self.source.data["time_arr"]).date()
+        last_data_point = np.max(self.source.data["time_arr"]).date()
         if last_data_point < one_week_ago:
             # keep at least one point in the plot if there was
             # no TA data this week
@@ -913,21 +1375,30 @@ def setup_date_range(self):
 
         # allowed range is from the first ever data point to today
         self.date_range = DateRangeSlider(
-            title="Date range displayed", start=first_data_point,
-            end=end_date, value=(start_date, end_date), step=1)
-
-        callback = CustomJS(args=dict(s=self.source), code="""
+            title="Date range displayed",
+            start=first_data_point,
+            end=end_date,
+            value=(start_date, end_date),
+            step=1,
+        )
+
+        callback = CustomJS(
+            args=dict(s=self.source),
+            code="""
             s.change.emit();
-        """)
-        self.date_range.js_on_change('value', callback)
+        """,
+        )
+        self.date_range.js_on_change("value", callback)
 
-        self.date_filter = CustomJSFilter(args=dict(slider=self.date_range), code="""
+        self.date_filter = CustomJSFilter(
+            args=dict(slider=self.date_range),
+            code="""
                 var indices = [];
                 var start = slider.value[0];
                 var end = slider.value[1];
 
                 for (var i=0; i < source.get_length(); i++) {
-                    if (source.data['time_arr'][i] >= start 
+                    if (source.data['time_arr'][i] >= start
                             && source.data['time_arr'][i] <= end) {
                         indices.push(true);
                     } else {
@@ -935,18 +1406,16 @@ def setup_date_range(self):
                     }
                 }
                 return indices;
-                """)
-        self.date_view = CDSView(source=self.source, filters=[self.date_filter])
+                """,
+        )
+        self.date_view = CDSView(filters=[self.date_filter])
 
     def mk_plt_layout(self):
         """Create the bokeh plot layout"""
-        self.source = ColumnDataSource(data=self.msata_data)
-
-        # make sure all arrays are lists in order to later be able to read the data
-        # from the html file
-        for item in self.source.data:
-            if not isinstance(self.source.data[item], (str, float, int, list)):
-                self.source.data[item] = self.source.data[item].tolist()
+        self.query_results = pd.DataFrame(
+            list(NIRSpecMsataStats.objects.all().values())
+        )
+        self.source = ColumnDataSource(data=self.query_results)
 
         # add a time array to the data source
         self.add_time_column()
@@ -973,8 +1442,11 @@ def mk_plt_layout(self):
         p11 = self.plt_mags_time()
 
         # make grid
-        grid = gridplot([p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12],
-                        ncols=2, merge_tools=False)
+        grid = gridplot(
+            [p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12],
+            ncols=2,
+            merge_tools=False,
+        )
         box_layout = layout(children=[self.date_range, grid])
         save(box_layout)
 
@@ -985,8 +1457,25 @@ def mk_plt_layout(self):
     def identify_tables(self):
         """Determine which database tables to use for a run of the TA monitor."""
         mixed_case_name = JWST_INSTRUMENT_NAMES_MIXEDCASE[self.instrument]
-        self.query_table = eval('{}TAQueryHistory'.format(mixed_case_name))
-        self.stats_table = eval('{}TAStats'.format(mixed_case_name))
+        self.query_table = eval("{}TaQueryHistory".format(mixed_case_name))
+        self.stats_table = eval("{}MsataStats".format(mixed_case_name))
+
+    def file_exists_in_database(self, filename):
+        """Checks if an entry for filename exists in the MSATA stats
+        database.
+
+        Parameters
+        ----------
+        filename : str
+            The full path to the uncal filename.
+
+        Returns
+        -------
+        file_exists : bool
+            ``True`` if filename exists in the MSATA stats database.
+        """
+        results = self.stats_table.objects.filter(filename__iexact=filename).values()
+        return len(results) != 0
 
     def most_recent_search(self):
         """Query the query history database and return the information
@@ -999,60 +1488,27 @@ def most_recent_search(self):
             Date (in MJD) of the ending range of the previous MAST query
             where the msata monitor was run.
         """
-        query = session.query(self.query_table).filter(and_(self.query_table.aperture == self.aperture,
-                                                            self.query_table.run_monitor == True)).order_by(self.query_table.end_time_mjd).all()
 
-        dates = np.zeros(0)
-        for instance in query:
-            dates = np.append(dates, instance.end_time_mjd)
+        filters = {"aperture__iexact": self.aperture, "run_monitor": True}
+
+        record = (
+            self.query_table.objects.filter(**filters).order_by("-end_time_mjd").first()
+        )
 
-        query_count = len(dates)
-        if query_count == 0:
+        if record is None:
             query_result = self.query_very_beginning
-            logging.info(('\tNo query history for {}. Beginning search date will be set to {}.'
-                         .format(self.aperture, self.query_very_beginning)))
+            logging.info(
+                (
+                    "\tNo query history for {}. Beginning search date will be set to {}.".format(
+                        self.aperture, self.query_very_beginning
+                    )
+                )
+            )
         else:
-            query_result = np.max(dates)
+            query_result = record.end_time_mjd
 
         return query_result
 
-    def get_data_from_html(self, html_file):
-        """
-        This function gets the data from the Bokeh html file created with
-        the NIRSpec TA monitor script.
-        Parameters
-        ----------
-        html_file: str
-            File created by the monitor script
-        Returns
-        -------
-        prev_data_dict: dict
-            Dictionary containing all data used in the plots
-        """
-
-        # open the html file and get the contents
-        htmlFileToBeOpened = open(html_file, "r")
-        contents = htmlFileToBeOpened.read()
-        soup = BeautifulSoup(contents, 'html.parser')
-
-        # now read as python dictionary and search for the data
-        prev_data_dict = {}
-        html_data = json.loads(soup.find('script', type='application/json').string)
-        for key, val in html_data.items():
-            if 'roots' in val:   # this is a dictionary
-                if 'references' in val['roots']:
-                    for item in val['roots']['references']:    # this is a list
-                        # each item of the list is a dictionary
-                        for item_key, item_val in item.items():
-                            if 'data' in item_val:
-                                # finally the data dictionary!
-                                for data_key, data_val in item_val['data'].items():
-                                    prev_data_dict[data_key] = data_val
-        # set to None if dictionary is empty
-        if not bool(prev_data_dict):
-            prev_data_dict = None
-        return prev_data_dict
-
     def construct_expected_data(self, keywd_dict, tot_number_of_stars):
         """This function creates the list to append to the dictionary key in the expected format.
         Parameters
@@ -1070,71 +1526,26 @@ def construct_expected_data(self, keywd_dict, tot_number_of_stars):
         val = -999
         list4dict = []
         # create either the list or return the right type of value
-        if keywd_dict['loc'] != 'ta_table':  # these cases should be singe values per observation
-            if keywd_dict['type'] == float:
+        if (
+            keywd_dict["loc"] != "ta_table"
+        ):  # these cases should be singe values per observation
+            if keywd_dict["type"] == float:
                 val = float(val)
-            if keywd_dict['type'] == str:
+            if keywd_dict["type"] == str:
                 val = str(val)
             list4dict = val
         else:
-            for tns in tot_number_of_stars:   # elements the list of lists should have
+            for tns in tot_number_of_stars:  # elements the list of lists should have
                 list2append = []
-                for _ in range(tns):   # elements each sublist should have
-                    if keywd_dict['type'] == float:
+                for _ in range(tns):  # elements each sublist should have
+                    if keywd_dict["type"] == float:
                         val = float(val)
-                    if keywd_dict['type'] == str:
+                    if keywd_dict["type"] == str:
                         val = str(val)
                     list2append.append(val)
                 list4dict.append(list2append)
         return list4dict
 
-    def prev_data2expected_format(self, prev_data_dict):
-        """Add all the necessary columns to match expected format to combine previous
-        and new data.
-        Parameters
-        ----------
-        prev_data_dict: dictionary
-            Dictionary containing all data used in the Bokeh html file plots
-        Returns
-        -------
-        prev_data: pandas dataframe
-            Contains all expected columns to be combined with the new data
-        latest_prev_obs: str
-            Date of the latest observation in the previously plotted data
-        """
-        # remember that the time array created is in milliseconds, removing to get time object
-        time_in_millis = max(prev_data_dict['time_arr'])
-        latest_prev_obs = Time(time_in_millis / 1000., format='unix')
-        latest_prev_obs = latest_prev_obs.mjd
-        prev_data_expected_cols = {}
-        tot_number_of_stars = prev_data_dict['tot_number_of_stars']
-        for file_keywd, keywd_dict in self.keywds2extract.items():
-            key = keywd_dict['name']
-            if key in prev_data_dict:
-                # case when all the info of all visits and ref stars is in the same list
-                if len(prev_data_dict[key]) > len(tot_number_of_stars):
-                    correct_arrangement = []
-                    correct_start_idx, correct_end_idx = 0, tot_number_of_stars[0]
-                    for idx, tns in enumerate(tot_number_of_stars):
-                        list2append = prev_data_dict[key][correct_start_idx: correct_end_idx]
-                        correct_arrangement.append(list2append)
-                        correct_start_idx = correct_end_idx
-                        correct_end_idx += tns
-                    prev_data_expected_cols[key] = correct_arrangement
-                # case when the html stored thing is just an object but does not have data
-                elif len(prev_data_dict[key]) < len(tot_number_of_stars):
-                    list4dict = self.construct_expected_data(keywd_dict, tot_number_of_stars)
-                    prev_data_expected_cols[key] = list4dict
-                # case when nothing special to do
-                else:
-                    prev_data_expected_cols[key] = prev_data_dict[key]
-            else:
-                list4dict = self.construct_expected_data(keywd_dict, tot_number_of_stars)
-                prev_data_expected_cols[key] = list4dict
-        # now convert to a panda dataframe to be combined with the new data
-        prev_data = pd.DataFrame(prev_data_expected_cols)
-        return prev_data, latest_prev_obs
-
     def pull_filenames(self, file_info):
         """Extract filenames from the list of file information returned from
         query_mast.
@@ -1151,10 +1562,10 @@ def pull_filenames(self, file_info):
         """
         files = []
         for list_element in file_info:
-            if 'filename' in list_element:
-                files.append(list_element['filename'])
-            elif 'root_name' in list_element:
-                files.append(list_element['root_name'])
+            if "filename" in list_element:
+                files.append(list_element["filename"])
+            elif "root_name" in list_element:
+                files.append(list_element["root_name"])
         return files
 
     def get_uncal_names(self, file_list):
@@ -1170,13 +1581,13 @@ def get_uncal_names(self, file_list):
         """
         good_files = []
         for filename in file_list:
-            if filename.endswith('.fits'):
+            if filename.endswith(".fits"):
                 # MAST names look like: jw01133003001_02101_00001_nrs2_cal.fits
-                suffix2replace = filename.split('_')[-1]
-                filename = filename.replace(suffix2replace, 'uncal.fits')
+                suffix2replace = filename.split("_")[-1]
+                filename = filename.replace(suffix2replace, "uncal.fits")
             else:
                 # rootnames look like: jw01133003001_02101_00001_nrs2
-                filename += '_uncal.fits'
+                filename += "_uncal.fits"
             if filename not in good_files:
                 good_files.append(filename)
         return good_files
@@ -1194,20 +1605,30 @@ def update_ta_success_txtfile(self):
         # check if previous file exsists and read the data from it
         if os.path.isfile(output_success_ta_txtfile):
             # now rename the previous file, for backup
-            os.rename(output_success_ta_txtfile, os.path.join(self.output_dir, "prev_msata_success.txt"))
+            os.rename(
+                output_success_ta_txtfile,
+                os.path.join(self.output_dir, "prev_msata_success.txt"),
+            )
         # get the new data
         ta_success, ta_inprogress, ta_failure = [], [], []
-        filenames, ta_status = self.msata_data.loc[:,'filename'], self.msata_data.loc[:,'ta_status']
+        filenames, ta_status = (
+            self.msata_data.loc[:, "filename"],
+            self.msata_data.loc[:, "ta_status"],
+        )
         for fname, ta_stat in zip(filenames, ta_status):
             # select the appropriate list to append to
-            if ta_stat == 'SUCCESSFUL':
+            if ta_stat == "SUCCESSFUL":
                 ta_success.append(fname)
-            elif ta_stat == 'IN_PROGRESS':
+            elif ta_stat == "IN_PROGRESS":
                 ta_inprogress.append(fname)
             else:
                 ta_failure.append(fname)
         # find which one is the longest list (to make sure the other lists have the same length)
-        successes, inprogress, failures = len(ta_success), len(ta_inprogress), len(ta_failure)
+        successes, inprogress, failures = (
+            len(ta_success),
+            len(ta_inprogress),
+            len(ta_failure),
+        )
         longest_list = None
         if successes >= inprogress:
             longest_list = successes
@@ -1222,178 +1643,222 @@ def update_ta_success_txtfile(self):
                 for _ in range(remaining_items):
                     ta_list.append("")
         # write the new output file
-        with open(output_success_ta_txtfile, 'w+') as txt:
+        with open(output_success_ta_txtfile, "w+") as txt:
             txt.write("# MSATA successes and failure file names \n")
-            filehdr1 = "# {} Total successful and {} total failed MSATA ".format(successes, failures)
-            filehdr2 = "# {:<50} {:<50} {:<50}".format("Successes", "In_Progress", "Failures")
+            filehdr1 = "# {} Total successful and {} total failed MSATA ".format(
+                successes, failures
+            )
+            filehdr2 = "# {:<50} {:<50} {:<50}".format(
+                "Successes", "In_Progress", "Failures"
+            )
             txt.write(filehdr1 + "\n")
             txt.write(filehdr2 + "\n")
             for idx, suc in enumerate(ta_success):
-                line = "{:<50} {:<50} {:<50}".format(suc, ta_inprogress[idx], ta_failure[idx])
+                line = "{:<50} {:<50} {:<50}".format(
+                    suc, ta_inprogress[idx], ta_failure[idx]
+                )
                 txt.write(line + "\n")
 
-    def read_existing_html(self):
-        """
-        This function gets the data from the Bokeh html file created with
-        the NIRSpec TA monitor script.
-        """
-        self.output_dir = os.path.join(get_config()['outputs'], 'msata_monitor')
-        ensure_dir_exists(self.output_dir)
-
-        self.output_file_name = os.path.join(self.output_dir, "msata_layout.html")
-        if not os.path.isfile(self.output_file_name):
-            return 'No MSATA data available', '', ''
-
-        # open the html file and get the contents
-        with open(self.output_file_name, "r") as html_file:
-            contents = html_file.read()
-
-        soup = BeautifulSoup(contents, 'html.parser').body
-
-        # find the script elements
-        script1 = str(soup.find('script', type='text/javascript'))
-        script2 = str(soup.find('script', type='application/json'))
-
-        # find the div element
-        div = str(soup.find('div', class_='bk-root'))
-        return div, script1, script2
+    def add_msata_data(self):
+        """Method to add MSATA data to stats database"""
+        # self.msata_data is a pandas dataframe. When creating the django model
+        # to store all of the MSATA data, this data was previously extracted and stored
+        # into a dataframe. To avoid rewriting self.get_msata_data(), it is easier to
+        # iterate over the rows of the returned dataframe and access the metadata this
+        # way.
+        for _, row in self.msata_data.iterrows():
+            stats_db_entry = {
+                "filename": row["filename"],
+                "date_obs": self.add_timezone(row["date_obs"]),
+                "visit_id": row["visit_id"],
+                "tafilter": row["tafilter"],
+                "detector": row["detector"],
+                "readout": row["readout"],
+                "subarray": row["subarray"],
+                "num_refstars": row["num_refstars"],
+                "ta_status": row["ta_status"],
+                "v2halffacet": row["v2halffacet"],
+                "v3halffacet": row["v3halffacet"],
+                "v2msactr": row["v2msactr"],
+                "v3msactr": row["v3msactr"],
+                "lsv2offset": row["lsv2offset"],
+                "lsv3offset": row["lsv3offset"],
+                "lsoffsetmag": row["lsoffsetmag"],
+                "lsrolloffset": row["lsrolloffset"],
+                "lsv2sigma": row["lsv2sigma"],
+                "lsv3sigma": row["lsv3sigma"],
+                "lsiterations": row["lsiterations"],
+                "guidestarid": row["guidestarid"],
+                "guidestarx": row["guidestarx"],
+                "guidestary": row["guidestary"],
+                "guidestarroll": row["guidestarroll"],
+                "samx": row["samx"],
+                "samy": row["samy"],
+                "samroll": row["samroll"],
+                "box_peak_value": list(row["box_peak_value"]),
+                "reference_star_mag": list(row["reference_star_mag"]),
+                "convergence_status": list(row["convergence_status"]),
+                "reference_star_number": list(row["reference_star_number"]),
+                "lsf_removed_status": list(row["lsf_removed_status"]),
+                "lsf_removed_reason": list(row["lsf_removed_reason"]),
+                "lsf_removed_x": list(row["lsf_removed_x"]),
+                "lsf_removed_y": list(row["lsf_removed_y"]),
+                "planned_v2": list(row["planned_v2"]),
+                "planned_v3": list(row["planned_v3"]),
+                "stars_in_fit": row["stars_in_fit"],
+                "entry_date": datetime.now(tz=timezone.utc),
+            }
+
+            entry = self.stats_table(**stats_db_entry)
+            entry.save()
+
+            logging.info("\tNew entry added to MSATA stats database table")
+
+        logging.info("\tUpdated the MSATA statistics table")
 
     @log_fail
     @log_info
     def run(self):
         """The main method. See module docstrings for further details."""
 
-        logging.info('Begin logging for msata_monitor')
-
-        # define MSATA variables
-        self.instrument = "nirspec"
-        self.aperture = "NRS_FULL_MSA"
+        logging.info("Begin logging for msata_monitor")
 
         # Identify which database tables to use
         self.identify_tables()
 
         # Get the output directory and setup a directory to store the data
-        self.output_dir = os.path.join(get_config()['outputs'], 'msata_monitor')
+        self.output_dir = os.path.join(get_config()["outputs"], "msata_monitor")
         ensure_dir_exists(self.output_dir)
         # Set up directory to store the data
-        ensure_dir_exists(os.path.join(self.output_dir, 'data'))
-        self.data_dir = os.path.join(self.output_dir,
-                                     'data/{}_{}'.format(self.instrument.lower(),
-                                                         self.aperture.lower()))
+        ensure_dir_exists(os.path.join(self.output_dir, "data"))
+        self.data_dir = os.path.join(
+            self.output_dir,
+            "data/{}_{}".format(self.instrument.lower(), self.aperture.lower()),
+        )
         ensure_dir_exists(self.data_dir)
 
-        # Locate the record of most recent MAST search; use this time
+        # Locate the record of most recent time the monitor was run
         self.query_start = self.most_recent_search()
-        # get the data of the plots previously created and set the query start date
-        self.prev_data = None
         self.output_file_name = os.path.join(self.output_dir, "msata_layout.html")
-        logging.info('\tNew output plot file will be written as: {}'.format(self.output_file_name))
-        if os.path.isfile(self.output_file_name):
-            prev_data_dict = self.get_data_from_html(self.output_file_name)
-            self.prev_data, self.query_start = self.prev_data2expected_format(prev_data_dict)
-            logging.info('\tPrevious data read from html file: {}'.format(self.output_file_name))
-            # move this plot to a previous version
-            shutil.copyfile(self.output_file_name, os.path.join(self.output_dir, "prev_msata_layout.html"))
-        # fail save - start from the beginning if there is no html file
-        else:
-            self.query_start = self.query_very_beginning
-            logging.info('\tPrevious output html file not found. Starting MAST query from Jan 28, 2022 == First JWST images (MIRI)')
 
         # Use the current time as the end time for MAST query
         self.query_end = Time.now().mjd
-        logging.info('\tQuery times: {} {}'.format(self.query_start, self.query_end))
-
-        # Query for data using the aperture and the time of the
-        # most recent previous search as the starting time
+        logging.info("\tQuery times: {} {}".format(self.query_start, self.query_end))
 
-        # via MAST:
-        # new_entries = monitor_utils.mast_query_ta(
-        #     self.instrument, self.aperture, self.query_start, self.query_end)
-
-        # via django model:
-        new_entries = monitor_utils.model_query_ta(
-            self.instrument, self.aperture, self.query_start, self.query_end)
+        # Obtain all entries with instrument/aperture combinations:
+        new_entries = monitor_utils.mast_query_ta(
+            self.instrument, self.aperture, self.query_start, self.query_end
+        )
         msata_entries = len(new_entries)
-        logging.info('\tQuery has returned {} MSATA files for {}, {}.'.format(msata_entries, self.instrument, self.aperture))
+        logging.info(
+            "\tQuery has returned {} MSATA files for {}, {}.".format(
+                msata_entries, self.instrument, self.aperture
+            )
+        )
 
         # Filter new entries to only keep uncal files
         new_entries = self.pull_filenames(new_entries)
         new_entries = self.get_uncal_names(new_entries)
         msata_entries = len(new_entries)
-        logging.info('\tThere are {} uncal TA files to run the MSATA monitor.'.format(msata_entries))
+        logging.info(
+            "\tThere are {} uncal TA files to run the MSATA monitor.".format(
+                msata_entries
+            )
+        )
 
-        # Get full paths to the files
+        # Check if filenames RootFileInfo model are in data storgage
         new_filenames = []
         for filename_of_interest in new_entries:
-            if (self.prev_data is not None
-                    and filename_of_interest in self.prev_data['filename'].values):
-                logging.warning('\t\tFile {} already in previous data. Skipping.'.format(filename_of_interest))
+            if self.file_exists_in_database(filename_of_interest):
+                logging.warning(
+                    "\t\tFile {} in database already, passing.".format(
+                        filename_of_interest
+                    )
+                )
                 continue
-            try:
-                new_filenames.append(filesystem_path(filename_of_interest))
-                logging.warning('\tFile {} included for processing.'.format(filename_of_interest))
-            except FileNotFoundError:
-                logging.warning('\t\tUnable to locate {} in filesystem. Not including in processing.'.format(filename_of_interest))
-
+            else:
+                try:
+                    new_filenames.append(filesystem_path(filename_of_interest))
+                    logging.warning(
+                        "\t\tFile {} included for processing.".format(
+                            filename_of_interest
+                        )
+                    )
+                except FileNotFoundError:
+                    logging.warning(
+                        "\t\tUnable to locate {} in filesystem. Not including in processing.".format(
+                            filename_of_interest
+                        )
+                    )
+
+        # If there are no new files, monitor is skipped
         if len(new_filenames) == 0:
-            logging.warning('\t\t ** Unable to locate any file in filesystem. Nothing to process. ** ')
-
-        # Run the monitor on any new files
-        logging.info('\tMSATA monitor found {} new uncal files.'.format(len(new_filenames)))
-        self.script, self.div, self.msata_data = None, None, None
-        monitor_run = False
-        if len(new_filenames) > 0:   # new data was found
-            # get the data
-            self.new_msata_data, no_ta_ext_msgs = self.get_msata_data(new_filenames)
+            logging.info(
+                "\t\t ** Unable to locate any file in filesystem. Nothing to process. ** "
+            )
+            logging.info("\tMSATA monitor skipped. No MSATA data found.")
+            monitor_run = False
+        else:
+            # Run the monitor on any new files
+            # self.wata_data is a pandas dataframe
+            self.msata_data, no_ta_ext_msgs = self.get_msata_data(new_filenames)
+            logging.info(
+                "\tMSATA monitor found {} new uncal files.".format(len(new_filenames))
+            )
+
             if len(no_ta_ext_msgs) >= 1:
                 for item in no_ta_ext_msgs:
                     logging.info(item)
-            if self.new_msata_data is not None:
-                # concatenate with previous data
-                if self.prev_data is not None:
-                    self.msata_data = pd.concat([self.prev_data, self.new_msata_data])
-                    logging.info('\tData from previous html output file and new data concatenated.')
-                else:
-                    self.msata_data = self.new_msata_data
-                    logging.info('\tOnly new data was found - no previous html file.')
             else:
-                logging.info('\tMSATA monitor skipped. No MSATA data found.')
-        # make sure to return the old data if no new data is found
-        elif self.prev_data is not None:
-            self.msata_data = self.prev_data
-            logging.info('\tNo new data found. Using data from previous html output file.')
-        # make the plots if there is data
-        if self.msata_data is not None:
-            self.script, self.div = self.mk_plt_layout()
+                logging.info("\tNo TA Ext Msgs Found")
+
+            # Add MSATA data to stats table.
+            self.add_msata_data()
+
+            # Generate plot -- the database is queried in mk_plt_layout().
+            self.mk_plt_layout()
+            logging.info(
+                "\tNew output plot file will be written as: {}".format(
+                    self.output_file_name
+                )
+            )
+            # Once data is added to database table and plots are made, the
+            # monitor has run successfully.
             monitor_run = True
-            logging.info('\tOutput html plot file created: {}'.format(self.output_file_name))
-            msata_files_used4plots = len(self.msata_data['visit_id'])
-            logging.info('\t{} MSATA files were used to make plots.'.format(msata_files_used4plots))
+            logging.info(
+                "\tOutput html plot file created: {}".format(self.output_file_name)
+            )
+            msata_files_used4plots = len(self.msata_data["visit_id"])
+            logging.info(
+                "\t{} MSATA files were used to make plots.".format(
+                    msata_files_used4plots
+                )
+            )
             # update the list of successful and failed TAs
             self.update_ta_success_txtfile()
-            logging.info('\tMSATA status file was updated')
-        else:
-            logging.info('\tMSATA monitor skipped.')
+            logging.info("\tMSATA status file was updated")
 
         # Update the query history
-        new_entry = {'instrument': 'nirspec',
-                     'aperture': self.aperture,
-                     'start_time_mjd': self.query_start,
-                     'end_time_mjd': self.query_end,
-                     'entries_found': msata_entries,
-                     'files_found': len(new_filenames),
-                     'run_monitor': monitor_run,
-                     'entry_date': datetime.now()}
-        with engine.begin() as connection:
-            connection.execute(self.query_table.__table__.insert(), new_entry)
-        logging.info('\tUpdated the query history table')
-
-        logging.info('MSATA Monitor completed successfully.')
-
-
-if __name__ == '__main__':
-
-    module = os.path.basename(__file__).strip('.py')
+        new_entry = {
+            "instrument": "nirspec",
+            "aperture": self.aperture,
+            "start_time_mjd": self.query_start,
+            "end_time_mjd": self.query_end,
+            "entries_found": msata_entries,
+            "files_found": len(new_filenames),
+            "run_monitor": monitor_run,
+            "entry_date": datetime.now(tz=timezone.utc),
+        }
+
+        entry = self.query_table(**new_entry)
+        entry.save()
+        logging.info("\tUpdated the query history table")
+
+        logging.info("MSATA Monitor completed successfully.")
+
+
+if __name__ == "__main__":
+    module = os.path.basename(__file__).strip(".py")
     start_time, log_file = monitor_utils.initialize_instrument_monitor(module)
 
     monitor = MSATA()
diff --git a/jwql/instrument_monitors/nirspec_monitors/ta_monitors/wata_monitor.py b/jwql/instrument_monitors/nirspec_monitors/ta_monitors/wata_monitor.py
index f248a1d09..e11955420 100755
--- a/jwql/instrument_monitors/nirspec_monitors/ta_monitors/wata_monitor.py
+++ b/jwql/instrument_monitors/nirspec_monitors/ta_monitors/wata_monitor.py
@@ -7,7 +7,7 @@
 #    Sep 2022 - Vr. 1.1: Modified ColumnDataSource so that data could be recovered
 #                        from an html file of a previous run of the monitor and
 #                        included the code to read and format the data from the html file
-
+#    Apr 2024 - Vr. 1.2: Removed html webscraping and now store data in django models
 
 """
 This module contains the code for the NIRSpec Wide Aperture Target
@@ -21,6 +21,7 @@
 ______
     - Maria Pena-Guerrero
     - Melanie Clarke
+    - Mees Fix
 
 Use
 ---
@@ -29,13 +30,11 @@
 
 """
 
-
 # general imports
-import json
 import os
 import logging
-import shutil
 from datetime import datetime, timezone, timedelta
+from dateutil import parser
 
 import numpy as np
 import pandas as pd
@@ -45,24 +44,45 @@
 from bokeh.io import output_file
 from bokeh.layouts import gridplot, layout
 from bokeh.models import (
-    ColumnDataSource, Range1d, CustomJS, CustomJSFilter, CDSView,
-    Span, Label, DateRangeSlider)
+    ColumnDataSource,
+    Range1d,
+    CustomJS,
+    CustomJSFilter,
+    CDSView,
+    Span,
+    Label,
+    DateRangeSlider,
+)
 from bokeh.models.tools import HoverTool, BoxSelectTool
 from bokeh.plotting import figure, save
-from bs4 import BeautifulSoup
-from sqlalchemy.sql.expression import and_
 
 # jwql imports
+from jwql.utils.constants import ON_GITHUB_ACTIONS, ON_READTHEDOCS
 from jwql.utils.logging_functions import log_info, log_fail
 from jwql.utils import monitor_utils
 from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE
-from jwql.database.database_interface import session, engine
-from jwql.database.database_interface import NIRSpecTAQueryHistory, NIRSpecTAStats
-from jwql.utils.utils import ensure_dir_exists, filesystem_path, get_config, filename_parser
+from jwql.utils.utils import (
+    ensure_dir_exists,
+    filesystem_path,
+    get_config,
+)
+
+
+if not ON_GITHUB_ACTIONS and not ON_READTHEDOCS:
+    # Need to set up django apps before we can access the models
+    import django  # noqa: E402 (module level import not at top of file)
+
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "jwql.website.jwql_proj.settings")
+    django.setup()
 
+    from jwql.website.apps.jwql.monitor_models.ta import (
+        NIRSpecWataStats,
+        NIRSpecTaQueryHistory,
+    )  # noqa: E402 (module level import not at top of file)
 
-class WATA():
-    """ Class for executing the NIRSpec WATA monitor.
+
+class WATA:
+    """Class for executing the NIRSpec WATA monitor.
 
     This class will search for new WATA current files in the file systems
     for NIRSpec and will run the monitor on these files. The monitor will
@@ -89,48 +109,67 @@ class WATA():
     """
 
     def __init__(self):
-        """ Initialize an instance of the WATA class """
+        """Initialize an instance of the WATA class"""
+        # define WATA variables
+        self.instrument = "nirspec"
+        self.aperture = "NRS_S1600A1_SLIT"
+
         # Very beginning of intake of images: Jan 28, 2022 == First JWST images (MIRI)
         self.query_very_beginning = 59607.0
 
         # structure to define required keywords to extract and where they live
-        self.keywds2extract = {'FILENAME': {'loc': 'main_hdr', 'alt_key': None, 'name': 'filename', 'type': str},
-                               'DATE-BEG': {'loc': 'main_hdr', 'alt_key': None, 'name': 'date_obs'},
-                               'OBS_ID': {'loc': 'main_hdr', 'alt_key': 'OBSID', 'name': 'visit_id'},
-                               'FILTER': {'loc': 'main_hdr', 'alt_key': 'FWA_POS', 'name': 'tafilter'},
-                               'READOUT': {'loc': 'main_hdr', 'alt_key': 'READPATT', 'name': 'readout'},
-                               'TASTATUS': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'ta_status'},
-                               'STAT_RSN': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'status_reason'},
-                               'REFSTNAM': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'star_name'},
-                               'REFSTRA': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'star_ra'},
-                               'REFSTDEC': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'star_dec'},
-                               'REFSTMAG': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'star_mag'},
-                               'REFSTCAT': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'star_catalog'},
-                               'V2_PLAND': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'planned_v2'},
-                               'V3_PLAND': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'planned_v3'},
-                               'EXTCOLST': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'stamp_start_col'},
-                               'EXTROWST': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'stamp_start_row'},
-                               'TA_DTCTR': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'star_detector'},
-                               'BOXPKVAL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'max_val_box'},
-                               'BOXPKCOL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'max_val_box_col'},
-                               'BOXPKROW': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'max_val_box_row'},
-                               'TA_ITERS': {'loc': 'ta_hdr', 'alt_key': 'CENITERS', 'name': 'iterations'},
-                               'CORR_COL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'corr_col'},
-                               'CORR_ROW': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'corr_row'},
-                               'IMCENCOL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'stamp_final_col'},
-                               'IMCENROW': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'stamp_final_row'},
-                               'DTCENCOL': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'detector_final_col'},
-                               'DTCENROW': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'detector_final_row'},
-                               'SCIXCNTR': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'final_sci_x'},
-                               'SCIYCNTR': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'final_sci_y'},
-                               'TARGETV2': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'measured_v2'},
-                               'TARGETV3': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'measured_v3'},
-                               'V2_REF': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'ref_v2'},
-                               'V3_REF': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'ref_v3'},
-                               'V2_RESID': {'loc': 'ta_hdr', 'alt_key': 'V2_OFFST', 'name': 'v2_offset'},
-                               'V3_RESID': {'loc': 'ta_hdr', 'alt_key': 'V3_OFFST', 'name': 'v3_offset'},
-                               'SAM_X': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'sam_x'},
-                               'SAM_Y': {'loc': 'ta_hdr', 'alt_key': None, 'name': 'sam_y'}}
+        self.keywds2extract = {
+            "FILENAME": {
+                "loc": "main_hdr",
+                "alt_key": None,
+                "name": "filename",
+                "type": str,
+            },
+            "DATE-BEG": {"loc": "main_hdr", "alt_key": None, "name": "date_obs"},
+            "OBS_ID": {"loc": "main_hdr", "alt_key": "OBSID", "name": "visit_id"},
+            "FILTER": {"loc": "main_hdr", "alt_key": "FWA_POS", "name": "tafilter"},
+            "READOUT": {"loc": "main_hdr", "alt_key": "READPATT", "name": "readout"},
+            "TASTATUS": {"loc": "ta_hdr", "alt_key": None, "name": "ta_status"},
+            "STAT_RSN": {"loc": "ta_hdr", "alt_key": None, "name": "status_reason"},
+            "REFSTNAM": {"loc": "ta_hdr", "alt_key": None, "name": "star_name"},
+            "REFSTRA": {"loc": "ta_hdr", "alt_key": None, "name": "star_ra"},
+            "REFSTDEC": {"loc": "ta_hdr", "alt_key": None, "name": "star_dec"},
+            "REFSTMAG": {"loc": "ta_hdr", "alt_key": None, "name": "star_mag"},
+            "REFSTCAT": {"loc": "ta_hdr", "alt_key": None, "name": "star_catalog"},
+            "V2_PLAND": {"loc": "ta_hdr", "alt_key": None, "name": "planned_v2"},
+            "V3_PLAND": {"loc": "ta_hdr", "alt_key": None, "name": "planned_v3"},
+            "EXTCOLST": {"loc": "ta_hdr", "alt_key": None, "name": "stamp_start_col"},
+            "EXTROWST": {"loc": "ta_hdr", "alt_key": None, "name": "stamp_start_row"},
+            "TA_DTCTR": {"loc": "ta_hdr", "alt_key": None, "name": "star_detector"},
+            "BOXPKVAL": {"loc": "ta_hdr", "alt_key": None, "name": "max_val_box"},
+            "BOXPKCOL": {"loc": "ta_hdr", "alt_key": None, "name": "max_val_box_col"},
+            "BOXPKROW": {"loc": "ta_hdr", "alt_key": None, "name": "max_val_box_row"},
+            "TA_ITERS": {"loc": "ta_hdr", "alt_key": "CENITERS", "name": "iterations"},
+            "CORR_COL": {"loc": "ta_hdr", "alt_key": None, "name": "corr_col"},
+            "CORR_ROW": {"loc": "ta_hdr", "alt_key": None, "name": "corr_row"},
+            "IMCENCOL": {"loc": "ta_hdr", "alt_key": None, "name": "stamp_final_col"},
+            "IMCENROW": {"loc": "ta_hdr", "alt_key": None, "name": "stamp_final_row"},
+            "DTCENCOL": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "detector_final_col",
+            },
+            "DTCENROW": {
+                "loc": "ta_hdr",
+                "alt_key": None,
+                "name": "detector_final_row",
+            },
+            "SCIXCNTR": {"loc": "ta_hdr", "alt_key": None, "name": "final_sci_x"},
+            "SCIYCNTR": {"loc": "ta_hdr", "alt_key": None, "name": "final_sci_y"},
+            "TARGETV2": {"loc": "ta_hdr", "alt_key": None, "name": "measured_v2"},
+            "TARGETV3": {"loc": "ta_hdr", "alt_key": None, "name": "measured_v3"},
+            "V2_REF": {"loc": "ta_hdr", "alt_key": None, "name": "ref_v2"},
+            "V3_REF": {"loc": "ta_hdr", "alt_key": None, "name": "ref_v3"},
+            "V2_RESID": {"loc": "ta_hdr", "alt_key": "V2_OFFST", "name": "v2_offset"},
+            "V3_RESID": {"loc": "ta_hdr", "alt_key": "V3_OFFST", "name": "v3_offset"},
+            "SAM_X": {"loc": "ta_hdr", "alt_key": None, "name": "sam_x"},
+            "SAM_Y": {"loc": "ta_hdr", "alt_key": None, "name": "sam_y"},
+        }
 
         # initialize attributes to be set later
         self.source = None
@@ -139,7 +178,7 @@ def __init__(self):
         self.date_view = None
 
     def get_tainfo_from_fits(self, fits_file):
-        """ Get the TA information from the fits file
+        """Get the TA information from the fits file
         Parameters
         ----------
         fits_file: str
@@ -154,22 +193,22 @@ def get_tainfo_from_fits(self, fits_file):
         with fits.open(fits_file) as ff:
             # make sure this is a WATA file
             for hdu in ff:
-                if 'TARG_ACQ' in hdu.name:
+                if "TARG_ACQ" in hdu.name:
                     wata = True
                     break
             if not wata:
                 return None
             main_hdr = ff[0].header
             try:
-                ta_hdr = ff['TARG_ACQ'].header
+                ta_hdr = ff["TARG_ACQ"].header
             except KeyError:
-                no_ta_ext_msg = 'No TARG_ACQ extension in file '+fits_file
+                no_ta_ext_msg = "No TARG_ACQ extension in file " + fits_file
                 return no_ta_ext_msg
         wata_info = [main_hdr, ta_hdr]
         return wata_info
 
     def get_wata_data(self, new_filenames):
-        """ Create the data array for the WATA input files
+        """Create the data array for the WATA input files
         Parameters
         ----------
         new_filenames: list
@@ -191,18 +230,18 @@ def get_wata_data(self, new_filenames):
                 continue
             main_hdr, ta_hdr = wata_info
             for key, key_dict in self.keywds2extract.items():
-                key_name = key_dict['name']
+                key_name = key_dict["name"]
                 if key_name not in wata_dict:
                     wata_dict[key_name] = []
                 ext = main_hdr
-                if key_dict['loc'] == 'ta_hdr':
+                if key_dict["loc"] == "ta_hdr":
                     ext = ta_hdr
                 try:
                     val = ext[key]
-                    if key == 'filename':
+                    if key == "filename":
                         val = fits_file
                 except KeyError:
-                    val = ext[key_dict['alt_key']]
+                    val = ext[key_dict["alt_key"]]
                 wata_dict[key_name].append(val)
         # create the pandas dataframe
         wata_df = pd.DataFrame(wata_dict)
@@ -210,19 +249,12 @@ def get_wata_data(self, new_filenames):
 
     def add_time_column(self):
         """Add time column to data source, to be used by all plots."""
-        date_obs = self.source.data['date_obs']
-        if 'time_arr' not in self.source.data:
-            time_arr = []
-            for do_str in date_obs:
-                # convert time string into an array of time (this is in UT)
-                t = datetime.fromisoformat(do_str)
-                time_arr.append(t)
-
-            # add to the bokeh data structure
-            self.source.data["time_arr"] = time_arr
+        date_obs = self.source.data["date_obs"].astype(str)
+        time_arr = [self.add_timezone(do_str) for do_str in date_obs]
+        self.source.data["time_arr"] = time_arr
 
     def plt_status(self):
-        """ Plot the WATA status (passed = 0 or failed = 1).
+        """Plot the WATA status (passed = 0 or failed = 1).
         Parameters
         ----------
             None
@@ -230,41 +262,55 @@ def plt_status(self):
         -------
             plot: bokeh plot object
         """
-        ta_status = self.source.data['ta_status']
+        ta_status = self.source.data["ta_status"]
 
         # check if this column exists in the data already, else create it
-        if 'bool_status' not in self.source.data:
+        if "bool_status" not in self.source.data:
             # bokeh does not like to plot strings, turn into binary type
             bool_status, status_colors = [], []
             for tas in ta_status:
-                if 'unsuccessful' not in tas.lower():
+                if "unsuccessful" not in tas.lower():
                     bool_status.append(1)
-                    status_colors.append('blue')
+                    status_colors.append("blue")
                 else:
                     bool_status.append(0)
-                    status_colors.append('red')
+                    status_colors.append("red")
 
             # add these to the bokeh data structure
             self.source.data["ta_status_bool"] = bool_status
             self.source.data["status_colors"] = status_colors
 
         # create a new bokeh plot
-        plot = figure(title="WATA Status [Success=1, Fail=0]", x_axis_label='Time',
-                      y_axis_label='WATA Status', x_axis_type='datetime',)
+        plot = figure(
+            title="WATA Status [Success=1, Fail=0]",
+            x_axis_label="Time",
+            y_axis_label="WATA Status",
+            x_axis_type="datetime",
+        )
         plot.y_range = Range1d(-0.5, 1.5)
-        plot.circle(x='time_arr', y='ta_status_bool', source=self.source,
-                    color='status_colors', size=7, fill_alpha=0.3, view=self.date_view)
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="ta_status_bool",
+            source=self.source,
+            color="status_colors",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
 
         # make tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Magnitude', '@star_mag'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Magnitude", "@star_mag"),
+            ("--------", "----------------"),
+        ]
 
         plot.add_tools(hover)
 
@@ -274,7 +320,7 @@ def plt_status(self):
         return plot
 
     def plt_residual_offsets(self):
-        """ Plot the residual V2 and V3 offsets
+        """Plot the residual V2 and V3 offsets
         Parameters
         ----------
             None
@@ -283,28 +329,41 @@ def plt_residual_offsets(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="WATA Residual V2-V3 Offsets", x_axis_label='Residual V2 Offset',
-                      y_axis_label='Residual V3 Offset')
-        plot.circle(x='v2_offset', y='v3_offset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="WATA Residual V2-V3 Offsets",
+            x_axis_label="Residual V2 Offset",
+            y_axis_label="Residual V3 Offset",
+        )
+        plot.scatter(
+            marker="circle",
+            x="v2_offset",
+            y="v3_offset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.x_range = Range1d(-0.5, 0.5)
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin lines
-        vline = Span(location=0, dimension='height', line_color='black', line_width=0.7)
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        vline = Span(location=0, dimension="height", line_color="black", line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([vline, hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Magnitude', '@star_mag'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Magnitude", "@star_mag"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -313,7 +372,7 @@ def plt_residual_offsets(self):
         return plot
 
     def plt_v2offset_time(self):
-        """ Plot the residual V2 versus time
+        """Plot the residual V2 versus time
         Parameters
         ----------
             None
@@ -322,26 +381,40 @@ def plt_v2offset_time(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="WATA V2 Offset vs Time", x_axis_label='Time',
-                      y_axis_label='Residual V2 Offset', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='v2_offset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="WATA V2 Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Residual V2 Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="v2_offset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Magnitude', '@star_mag'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Magnitude", "@star_mag"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -350,7 +423,7 @@ def plt_v2offset_time(self):
         return plot
 
     def plt_v3offset_time(self):
-        """ Plot the residual V3 versus time
+        """Plot the residual V3 versus time
         Parameters
         ----------
             None
@@ -359,26 +432,40 @@ def plt_v3offset_time(self):
             plot: bokeh plot object
         """
         # create a new bokeh plot
-        plot = figure(title="WATA V3 Offset vs Time", x_axis_label='Time',
-                      y_axis_label='Residual V3 Offset', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='v3_offset', source=self.source,
-                    color="blue", size=7, fill_alpha=0.3, view=self.date_view)
+        plot = figure(
+            title="WATA V3 Offset vs Time",
+            x_axis_label="Time",
+            y_axis_label="Residual V3 Offset",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="triangle",
+            x="time_arr",
+            y="v3_offset",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.3,
+            view=self.date_view,
+        )
         plot.y_range = Range1d(-0.5, 0.5)
 
         # mark origin line
-        hline = Span(location=0, dimension='width', line_color='black', line_width=0.7)
+        hline = Span(location=0, dimension="width", line_color="black", line_width=0.7)
         plot.renderers.extend([hline])
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Magnitude', '@star_mag'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Magnitude", "@star_mag"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -387,7 +474,7 @@ def plt_v3offset_time(self):
         return plot
 
     def plt_mag_time(self):
-        """ Plot the star magnitude versus time
+        """Plot the star magnitude versus time
         Parameters
         ----------
             None
@@ -396,39 +483,45 @@ def plt_mag_time(self):
             plot: bokeh plot object
         """
         # calculate the pseudo magnitudes
-        max_val_box, time_arr = self.source.data['max_val_box'], self.source.data['time_arr']
+        max_val_box, time_arr = (
+            self.source.data["max_val_box"],
+            self.source.data["time_arr"],
+        )
 
         # check if this column exists in the data already, else create it
         if "nrsrapid_f140x" not in self.source.data:
             # create the arrays per filter and readout pattern
             nrsrapid_f140x, nrsrapid_f110w, nrsrapid_clear = [], [], []
             nrsrapidd6_f140x, nrsrapidd6_f110w, nrsrapidd6_clear = [], [], []
-            filter_used, readout = self.source.data['tafilter'], self.source.data['readout']
+            filter_used, readout = (
+                self.source.data["tafilter"],
+                self.source.data["readout"],
+            )
             for i, val in enumerate(max_val_box):
-                if '140' in filter_used[i]:
-                    if readout[i].lower() == 'nrsrapid':
+                if "140" in filter_used[i]:
+                    if readout[i].lower() == "nrsrapid":
                         nrsrapid_f140x.append(val)
                         nrsrapid_f110w.append(np.NaN)
                         nrsrapid_clear.append(np.NaN)
                         nrsrapidd6_f140x.append(np.NaN)
                         nrsrapidd6_f110w.append(np.NaN)
                         nrsrapidd6_clear.append(np.NaN)
-                    elif readout[i].lower() == 'nrsrapidd6':
+                    elif readout[i].lower() == "nrsrapidd6":
                         nrsrapid_f140x.append(np.NaN)
                         nrsrapid_f110w.append(np.NaN)
                         nrsrapid_clear.append(np.NaN)
                         nrsrapidd6_f140x.append(val)
                         nrsrapidd6_f110w.append(np.NaN)
                         nrsrapidd6_clear.append(np.NaN)
-                elif '110' in filter_used[i]:
-                    if readout[i].lower() == 'nrsrapid':
+                elif "110" in filter_used[i]:
+                    if readout[i].lower() == "nrsrapid":
                         nrsrapid_f140x.append(np.NaN)
                         nrsrapid_f110w.append(val)
                         nrsrapid_clear.append(np.NaN)
                         nrsrapidd6_f140x.append(np.NaN)
                         nrsrapidd6_f110w.append(np.NaN)
                         nrsrapidd6_clear.append(np.NaN)
-                    elif readout[i].lower() == 'nrsrapidd6':
+                    elif readout[i].lower() == "nrsrapidd6":
                         nrsrapid_f140x.append(np.NaN)
                         nrsrapid_f110w.append(np.NaN)
                         nrsrapid_clear.append(np.NaN)
@@ -436,14 +529,14 @@ def plt_mag_time(self):
                         nrsrapidd6_f110w.append(val)
                         nrsrapidd6_clear.append(np.NaN)
                 else:
-                    if readout[i].lower() == 'nrsrapid':
+                    if readout[i].lower() == "nrsrapid":
                         nrsrapid_f140x.append(np.NaN)
                         nrsrapid_f110w.append(np.NaN)
                         nrsrapid_clear.append(val)
                         nrsrapidd6_f140x.append(np.NaN)
                         nrsrapidd6_f110w.append(np.NaN)
                         nrsrapidd6_clear.append(np.NaN)
-                    elif readout[i].lower() == 'nrsrapidd6':
+                    elif readout[i].lower() == "nrsrapidd6":
                         nrsrapid_f140x.append(np.NaN)
                         nrsrapid_f110w.append(np.NaN)
                         nrsrapid_clear.append(np.NaN)
@@ -460,31 +553,87 @@ def plt_mag_time(self):
             self.source.data["nrsrapidd6_clear"] = nrsrapidd6_clear
 
         # create a new bokeh plot
-        plot = figure(title="WATA Counts vs Time", x_axis_label='Time',
-                      y_axis_label='box_peak [Counts]', x_axis_type='datetime')
-        plot.circle(x='time_arr', y='nrsrapid_f140x', source=self.source,
-                    color="purple", size=7, fill_alpha=0.4, view=self.date_view)
-        plot.circle(x='time_arr', y='nrsrapidd6_f140x', source=self.source,
-                    color="purple", size=12, fill_alpha=0.4, view=self.date_view)
-        plot.triangle(x='time_arr', y='nrsrapid_f110w', source=self.source,
-                      color="orange", size=8, fill_alpha=0.4, view=self.date_view)
-        plot.triangle(x='time_arr', y='nrsrapidd6_f110w', source=self.source,
-                      color="orange", size=13, fill_alpha=0.4, view=self.date_view)
-        plot.square(x='time_arr', y='nrsrapid_clear', source=self.source,
-                    color="gray", size=7, fill_alpha=0.4, view=self.date_view)
-        plot.square(x='time_arr', y='nrsrapidd6_clear', source=self.source,
-                    color="gray", size=12, fill_alpha=0.4, view=self.date_view)
+        plot = figure(
+            title="WATA Counts vs Time",
+            x_axis_label="Time",
+            y_axis_label="box_peak [Counts]",
+            x_axis_type="datetime",
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="nrsrapid_f140x",
+            source=self.source,
+            color="purple",
+            size=7,
+            fill_alpha=0.4,
+            view=self.date_view,
+        )
+        plot.scatter(
+            marker="circle",
+            x="time_arr",
+            y="nrsrapidd6_f140x",
+            source=self.source,
+            color="purple",
+            size=12,
+            fill_alpha=0.4,
+            view=self.date_view,
+        )
+        plot.scatter(
+            marker="triangle",
+            x="time_arr",
+            y="nrsrapid_f110w",
+            source=self.source,
+            color="orange",
+            size=8,
+            fill_alpha=0.4,
+            view=self.date_view,
+        )
+        plot.scatter(
+            marker="triangle",
+            x="time_arr",
+            y="nrsrapidd6_f110w",
+            source=self.source,
+            color="orange",
+            size=13,
+            fill_alpha=0.4,
+            view=self.date_view,
+        )
+        plot.scatter(
+            marker="square",
+            x="time_arr",
+            y="nrsrapid_clear",
+            source=self.source,
+            color="gray",
+            size=7,
+            fill_alpha=0.4,
+            view=self.date_view,
+        )
+        plot.scatter(
+            marker="square",
+            x="time_arr",
+            y="nrsrapidd6_clear",
+            source=self.source,
+            color="gray",
+            size=12,
+            fill_alpha=0.4,
+            view=self.date_view,
+        )
 
         # add count saturation warning lines
         loc1, loc2, loc3 = 45000.0, 50000.0, 60000.0
-        hline1 = Span(location=loc1, dimension='width', line_color='green', line_width=3)
-        hline2 = Span(location=loc2, dimension='width', line_color='yellow', line_width=3)
-        hline3 = Span(location=loc3, dimension='width', line_color='red', line_width=3)
+        hline1 = Span(
+            location=loc1, dimension="width", line_color="green", line_width=3
+        )
+        hline2 = Span(
+            location=loc2, dimension="width", line_color="yellow", line_width=3
+        )
+        hline3 = Span(location=loc3, dimension="width", line_color="red", line_width=3)
         plot.renderers.extend([hline1, hline2, hline3])
 
-        label1 = Label(x=time_arr[-1], y=loc1, y_units='data', text='45000 counts')
-        label2 = Label(x=time_arr[-1], y=loc2, y_units='data', text='50000 counts')
-        label3 = Label(x=time_arr[-1], y=loc3, y_units='data', text='60000 counts')
+        label1 = Label(x=time_arr[-1], y=loc1, y_units="data", text="45000 counts")
+        label2 = Label(x=time_arr[-1], y=loc2, y_units="data", text="50000 counts")
+        label3 = Label(x=time_arr[-1], y=loc3, y_units="data", text="60000 counts")
         plot.add_layout(label1)
         plot.add_layout(label2)
         plot.add_layout(label3)
@@ -492,14 +641,16 @@ def plt_mag_time(self):
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Box peak', '@max_val_box'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Box peak", "@max_val_box"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -508,7 +659,7 @@ def plt_mag_time(self):
         return plot
 
     def get_unsuccessful_ta(self, arr_name):
-        """ Find unsuccessful TAs in this set (to be plotted in red)
+        """Find unsuccessful TAs in this set (to be plotted in red)
         Parameters
         ----------
             arr_name: str, name of the array of interest
@@ -529,7 +680,7 @@ def get_unsuccessful_ta(self, arr_name):
         return new_list_failed, new_list_else
 
     def plt_centroid(self):
-        """ Plot the WATA centroid
+        """Plot the WATA centroid
         Parameters
         ----------
             None
@@ -539,8 +690,8 @@ def plt_centroid(self):
         """
         # get the failed TAs to plot in red
         if "corr_col_failed" not in self.source.data:
-            corr_col_failed, corr_col_not_failed = self.get_unsuccessful_ta('corr_col')
-            corr_row_failed, corr_row_not_failed = self.get_unsuccessful_ta('corr_row')
+            corr_col_failed, corr_col_not_failed = self.get_unsuccessful_ta("corr_col")
+            corr_row_failed, corr_row_not_failed = self.get_unsuccessful_ta("corr_row")
 
             # add these to the bokeh data structure
             self.source.data["corr_col_failed"] = corr_col_failed
@@ -549,32 +700,48 @@ def plt_centroid(self):
             self.source.data["corr_row_not_failed"] = corr_row_not_failed
 
         # create a new bokeh plot
-        plot = figure(title="WATA Centroid", x_axis_label='Column',
-                      y_axis_label='Row')
+        plot = figure(title="WATA Centroid", x_axis_label="Column", y_axis_label="Row")
         limits = [10, 25]
         plot.x_range = Range1d(limits[0], limits[1])
         plot.y_range = Range1d(limits[0], limits[1])
-        plot.circle(x='corr_col_not_failed', y='corr_row_not_failed', source=self.source,
-                    color="blue", size=7, fill_alpha=0.5, view=self.date_view)
-        plot.circle(x='corr_col_failed', y='corr_row_failed', source=self.source,
-                    color="red", size=7, fill_alpha=0.5, view=self.date_view)
+        plot.scatter(
+            marker="circle",
+            x="corr_col_not_failed",
+            y="corr_row_not_failed",
+            source=self.source,
+            color="blue",
+            size=7,
+            fill_alpha=0.5,
+            view=self.date_view,
+        )
+        plot.scatter(
+            x="corr_col_failed",
+            y="corr_row_failed",
+            source=self.source,
+            color="red",
+            size=7,
+            fill_alpha=0.5,
+            view=self.date_view,
+        )
         plot.x_range = Range1d(0.0, 32.0)
         plot.y_range = Range1d(0.0, 32.0)
 
         # add tooltips
         hover = HoverTool()
-        hover.tooltips = [('File name', '@filename'),
-                          ('Visit ID', '@visit_id'),
-                          ('TA status', '@ta_status'),
-                          ('Filter', '@tafilter'),
-                          ('Readout', '@readout'),
-                          ('Date-Obs', '@date_obs'),
-                          ('Magnitude', '@star_mag'),
-                          ('Box Centr Col', '@corr_col'),
-                          ('Box Centr Row', '@corr_row'),
-                          ('Det Centr Col', '@detector_final_col'),
-                          ('Det Centr Row', '@detector_final_row'),
-                          ('--------', '----------------')]
+        hover.tooltips = [
+            ("File name", "@filename"),
+            ("Visit ID", "@visit_id"),
+            ("TA status", "@ta_status"),
+            ("Filter", "@tafilter"),
+            ("Readout", "@readout"),
+            ("Date-Obs", "@date_obs"),
+            ("Magnitude", "@star_mag"),
+            ("Box Centr Col", "@corr_col"),
+            ("Box Centr Row", "@corr_row"),
+            ("Det Centr Col", "@detector_final_col"),
+            ("Det Centr Row", "@detector_final_row"),
+            ("--------", "----------------"),
+        ]
         plot.add_tools(hover)
 
         # add shared selection tools
@@ -586,8 +753,8 @@ def setup_date_range(self):
         """Set up a date range filter, defaulting to the last week of data."""
         end_date = datetime.now(tz=timezone.utc)
         one_week_ago = end_date.date() - timedelta(days=7)
-        first_data_point = np.min(self.source.data['time_arr']).date()
-        last_data_point = np.max(self.source.data['time_arr']).date()
+        first_data_point = np.min(self.source.data["time_arr"]).date()
+        last_data_point = np.max(self.source.data["time_arr"]).date()
         if last_data_point < one_week_ago:
             # keep at least one point in the plot if there was
             # no TA data this week
@@ -597,21 +764,30 @@ def setup_date_range(self):
 
         # allowed range is from the first ever data point to today
         self.date_range = DateRangeSlider(
-            title="Date range displayed", start=first_data_point,
-            end=end_date, value=(start_date, end_date), step=1)
-
-        callback = CustomJS(args=dict(s=self.source), code="""
+            title="Date range displayed",
+            start=first_data_point,
+            end=end_date,
+            value=(start_date, end_date),
+            step=1,
+        )
+
+        callback = CustomJS(
+            args=dict(s=self.source),
+            code="""
             s.change.emit();
-        """)
-        self.date_range.js_on_change('value', callback)
+        """,
+        )
+        self.date_range.js_on_change("value", callback)
 
-        filt = CustomJSFilter(args=dict(slider=self.date_range), code="""
+        filt = CustomJSFilter(
+            args=dict(slider=self.date_range),
+            code="""
                 var indices = [];
                 var start = slider.value[0];
                 var end = slider.value[1];
 
                 for (var i=0; i < source.get_length(); i++) {
-                    if (source.data['time_arr'][i] >= start 
+                    if (source.data['time_arr'][i] >= start
                             && source.data['time_arr'][i] <= end) {
                         indices.push(true);
                     } else {
@@ -619,18 +795,15 @@ def setup_date_range(self):
                     }
                 }
                 return indices;
-                """)
-        self.date_view = CDSView(source=self.source, filters=[filt])
+                """,
+        )
+        self.date_view = CDSView(filters=[filt])
 
     def mk_plt_layout(self):
         """Create the bokeh plot layout"""
-        self.source = ColumnDataSource(data=self.wata_data)
+        self.query_results = pd.DataFrame(list(NIRSpecWataStats.objects.all().values()))
 
-        # make sure all arrays are lists in order to later be able to read the data
-        # from the html file
-        for item in self.source.data:
-            if not isinstance(self.source.data[item], (str, float, int, list)):
-                self.source.data[item] = self.source.data[item].tolist()
+        self.source = ColumnDataSource(data=self.query_results)
 
         # add a time array to the data source
         self.add_time_column()
@@ -659,11 +832,28 @@ def mk_plt_layout(self):
         script, div = components(box_layout)
         return script, div
 
+    def file_exists_in_database(self, filename):
+        """Checks if an entry for filename exists in the wata stats
+        database.
+
+        Parameters
+        ----------
+        filename : str
+            The full path to the uncal filename.
+
+        Returns
+        -------
+        file_exists : bool
+            ``True`` if filename exists in the WATA stats database.
+        """
+        results = self.stats_table.objects.filter(filename__iexact=filename).values()
+        return len(results) != 0
+
     def identify_tables(self):
         """Determine which database tables to use for a run of the TA monitor."""
         mixed_case_name = JWST_INSTRUMENT_NAMES_MIXEDCASE[self.instrument]
-        self.query_table = eval('{}TAQueryHistory'.format(mixed_case_name))
-        self.stats_table = eval('{}TAStats'.format(mixed_case_name))
+        self.query_table = eval("{}TaQueryHistory".format(mixed_case_name))
+        self.stats_table = eval("{}WataStats".format(mixed_case_name))
 
     def most_recent_search(self):
         """Query the query history database and return the information
@@ -676,103 +866,26 @@ def most_recent_search(self):
             Date (in MJD) of the ending range of the previous MAST query
             where the wata monitor was run.
         """
-        query = session.query(self.query_table).filter(and_(self.query_table.aperture == self.aperture,
-                                                            self.query_table.run_monitor == True)).order_by(self.query_table.end_time_mjd).all()
+        filters = {"aperture__iexact": self.aperture, "run_monitor": True}
 
-        dates = np.zeros(0)
-        for instance in query:
-            dates = np.append(dates, instance.end_time_mjd)
+        record = (
+            self.query_table.objects.filter(**filters).order_by("-end_time_mjd").first()
+        )
 
-        query_count = len(dates)
-        if query_count == 0:
+        if record is None:
             query_result = self.query_very_beginning
-            logging.info(('\tNo query history for {}. Beginning search date will be set to {}.'.format(self.aperture, self.query_very_beginning)))
+            logging.info(
+                (
+                    "\tNo query history for {}. Beginning search date will be set to {}.".format(
+                        self.aperture, self.query_very_beginning
+                    )
+                )
+            )
         else:
-            query_result = np.max(dates)
+            query_result = record.end_time_mjd
 
         return query_result
 
-    def get_expected_data(self, keywd_dict, tot_number_of_stars):
-        """This function gets the value append to the dictionary key in the expected format.
-        Parameters
-        ----------
-        keywd_dict: dictonary
-            Dictionary corresponding to the file keyword
-        tot_number_of_stars: integer
-            Number of stars in the observation
-        Returns
-        -------
-        val4dict: value
-            Value appended to the data structure; either string, float or integer
-        """
-        # set the value to add
-        val = -999
-        # return the right type of value
-        if keywd_dict['type'] == float:
-            val = float(val)
-        if keywd_dict['type'] == str:
-            val = str(val)
-        val4dict = val
-        return val4dict
-
-    def get_data_from_html(self, html_file):
-        """
-        This function gets the data from the Bokeh html file created with
-        the NIRSpec TA monitor script.
-        Parameters
-        ----------
-        html_file: str
-            File created by the monitor script
-        Returns
-        -------
-        prev_data: pandas dataframe
-            Contains all expected columns to be combined with the new data
-        latest_prev_obs: str
-            Date of the latest observation in the previously plotted data
-        """
-
-        # open the html file and get the contents
-        htmlFileToBeOpened = open(html_file, "r")
-        contents = htmlFileToBeOpened.read()
-        soup = BeautifulSoup(contents, 'html.parser')
-
-        # now read as python dictionary and search for the data
-        prev_data_dict = {}
-        html_data = json.loads(soup.find('script', type='application/json').string)
-        for key, val in html_data.items():
-            if 'roots' in val:   # this is a dictionary
-                if 'references' in val['roots']:
-                    for item in val['roots']['references']:    # this is a list
-                        # each item of the list is a dictionary
-                        for item_key, item_val in item.items():
-                            if 'data' in item_val:
-                                # finally the data dictionary!
-                                for data_key, data_val in item_val['data'].items():
-                                    prev_data_dict[data_key] = data_val
-        # find the latest observation date
-        time_in_millis = max(prev_data_dict['time_arr'])
-        latest_prev_obs = Time(time_in_millis / 1000., format='unix')
-        latest_prev_obs = latest_prev_obs.mjd
-        # put data in expected format
-        prev_data_expected_cols = {}
-        visit_ids = prev_data_dict['visit_id']
-        for file_keywd, keywd_dict in self.keywds2extract.items():
-            key = keywd_dict['name']
-            if key in prev_data_dict:
-                # case when the html stored thing is just an object but does not have data
-                if len(prev_data_dict[key]) < len(visit_ids):
-                    list4dict = self.get_expected_data(keywd_dict, visit_ids)
-                    prev_data_expected_cols[key] = list4dict
-                # case when nothing special to do
-                else:
-                    prev_data_expected_cols[key] = prev_data_dict[key]
-            else:
-                list4dict = self.get_expected_data(keywd_dict, visit_ids)
-                prev_data_expected_cols[key] = list4dict
-        # now convert to a panda dataframe to be combined with the new data
-        prev_data = pd.DataFrame(prev_data_expected_cols)
-        return prev_data, latest_prev_obs
-
     def pull_filenames(self, file_info):
         """Extract filenames from the list of file information returned from
         query_mast.
@@ -789,10 +902,10 @@ def pull_filenames(self, file_info):
         """
         files = []
         for list_element in file_info:
-            if 'filename' in list_element:
-                files.append(list_element['filename'])
-            elif 'root_name' in list_element:
-                files.append(list_element['root_name'])
+            if "filename" in list_element:
+                files.append(list_element["filename"])
+            elif "root_name" in list_element:
+                files.append(list_element["root_name"])
         return files
 
     def get_uncal_names(self, file_list):
@@ -808,13 +921,13 @@ def get_uncal_names(self, file_list):
         """
         good_files = []
         for filename in file_list:
-            if filename.endswith('.fits'):
+            if filename.endswith(".fits"):
                 # MAST names look like: jw01133003001_02101_00001_nrs2_cal.fits
-                suffix2replace = filename.split('_')[-1]
-                filename = filename.replace(suffix2replace, 'uncal.fits')
+                suffix2replace = filename.split("_")[-1]
+                filename = filename.replace(suffix2replace, "uncal.fits")
             else:
                 # rootnames look like: jw01133003001_02101_00001_nrs2
-                filename += '_uncal.fits'
+                filename += "_uncal.fits"
             if filename not in good_files:
                 good_files.append(filename)
         return good_files
@@ -832,13 +945,19 @@ def update_ta_success_txtfile(self):
         # check if previous file exists and read the data from it
         if os.path.isfile(output_success_ta_txtfile):
             # now rename the previous file, for backup
-            os.rename(output_success_ta_txtfile, os.path.join(self.output_dir, "prev_wata_success.txt"))
+            os.rename(
+                output_success_ta_txtfile,
+                os.path.join(self.output_dir, "prev_wata_success.txt"),
+            )
         # get the new data
         ta_success, ta_failure = [], []
-        filenames, ta_status = self.wata_data.loc[:,'filename'], self.wata_data.loc[:,'ta_status']
+        filenames, ta_status = (
+            self.wata_data.loc[:, "filename"],
+            self.wata_data.loc[:, "ta_status"],
+        )
         for fname, ta_stat in zip(filenames, ta_status):
             # select the appropriate list to append to
-            if ta_stat == 'SUCCESSFUL':
+            if ta_stat == "SUCCESSFUL":
                 ta_success.append(fname)
             else:
                 ta_failure.append(fname)
@@ -856,9 +975,11 @@ def update_ta_success_txtfile(self):
                 for _ in range(remaining_items):
                     ta_list.append("")
         # write the new output file
-        with open(output_success_ta_txtfile, 'w+') as txt:
+        with open(output_success_ta_txtfile, "w+") as txt:
             txt.write("# WATA successes and failure file names \n")
-            filehdr1 = "# {} Total successful and {} total failed WATA ".format(successes, failures)
+            filehdr1 = "# {} Total successful and {} total failed WATA ".format(
+                successes, failures
+            )
             filehdr2 = "# {:<50} {:<50}".format("Successes", "Failures")
             txt.write(filehdr1 + "\n")
             txt.write(filehdr2 + "\n")
@@ -866,167 +987,204 @@ def update_ta_success_txtfile(self):
                 line = "{:<50} {:<50}".format(suc, ta_failure[idx])
                 txt.write(line + "\n")
 
-    def read_existing_html(self):
-        """
-        This function gets the data from the Bokeh html file created with
-        the NIRSpec TA monitor script.
-        """
-        self.output_dir = os.path.join(get_config()['outputs'], 'wata_monitor')
-        ensure_dir_exists(self.output_dir)
-
-        self.output_file_name = os.path.join(self.output_dir, "wata_layout.html")
-        if not os.path.isfile(self.output_file_name):
-            return 'No WATA data available', '', ''
-
-        # open the html file and get the contents
-        with open(self.output_file_name, "r") as html_file:
-            contents = html_file.read()
-
-        soup = BeautifulSoup(contents, 'html.parser').body
-
-        # find the script elements
-        script1 = str(soup.find('script', type='text/javascript'))
-        script2 = str(soup.find('script', type='application/json'))
-
-        # find the div element
-        div = str(soup.find('div', class_='bk-root'))
-        return div, script1, script2
+    def add_timezone(self, date_str):
+        """Method to bypass timezone warning from Django"""
+        dt_timezone = parser.parse(date_str).replace(tzinfo=timezone.utc)
+        return dt_timezone
+
+    def add_wata_data(self):
+        """Method to add WATA data to stats database"""
+        # self.wata_data is a pandas dataframe. When creating the django model
+        # to store all of the WATA data, this data was previously extracted and stored
+        # into a dataframe. To avoid rewriting self.get_wata_data(), it is easier to
+        # iterate over the rows of the returned dataframe and access the metadata this
+        # way.
+        for _, row in self.wata_data.iterrows():
+            stats_db_entry = {
+                "filename": row["filename"],
+                "date_obs": self.add_timezone(row["date_obs"]),
+                "visit_id": row["visit_id"],
+                "tafilter": row["tafilter"],
+                "readout": row["readout"],
+                "ta_status": row["ta_status"],
+                "star_name": row["star_name"],
+                "star_ra": row["star_ra"],
+                "star_dec": row["star_dec"],
+                "star_mag": row["star_mag"],
+                "star_catalog": row["star_catalog"],
+                "planned_v2": row["planned_v2"],
+                "planned_v3": row["planned_v3"],
+                "stamp_start_col": row["stamp_start_col"],
+                "stamp_start_row": row["stamp_start_row"],
+                "star_detector": row["star_detector"],
+                "max_val_box": row["max_val_box"],
+                "max_val_box_col": row["max_val_box_col"],
+                "max_val_box_row": row["max_val_box_row"],
+                "iterations": row["iterations"],
+                "corr_col": row["corr_col"],
+                "corr_row": row["corr_row"],
+                "stamp_final_col": row["stamp_final_col"],
+                "stamp_final_row": row["stamp_final_row"],
+                "detector_final_col": row["detector_final_col"],
+                "detector_final_row": row["detector_final_row"],
+                "final_sci_x": row["final_sci_x"],
+                "final_sci_y": row["final_sci_y"],
+                "measured_v2": row["measured_v2"],
+                "measured_v3": row["measured_v3"],
+                "ref_v2": row["ref_v2"],
+                "ref_v3": row["ref_v3"],
+                "v2_offset": row["v2_offset"],
+                "v3_offset": row["v3_offset"],
+                "sam_x": row["sam_x"],
+                "sam_y": row["sam_y"],
+                "entry_date": datetime.now(tz=timezone.utc),
+            }
+
+            entry = self.stats_table(**stats_db_entry)
+            entry.save()
+
+            logging.info("\tNew entry added to WATA stats database table")
+
+        logging.info("\tUpdated the WATA statistics table")
 
     @log_fail
     @log_info
     def run(self):
         """The main method. See module docstrings for further details."""
 
-        logging.info('Begin logging for wata_monitor')
-
-        # define WATA variables
-        self.instrument = "nirspec"
-        self.aperture = "NRS_S1600A1_SLIT"
+        logging.info("Begin logging for wata_monitor")
 
         # Identify which database tables to use
         self.identify_tables()
 
         # Get the output directory and setup a directory to store the data
-        self.output_dir = os.path.join(get_config()['outputs'], 'wata_monitor')
+        self.output_dir = os.path.join(get_config()["outputs"], "wata_monitor")
         ensure_dir_exists(self.output_dir)
         # Set up directories for the copied data
-        ensure_dir_exists(os.path.join(self.output_dir, 'data'))
-        self.data_dir = os.path.join(self.output_dir,
-                                     'data/{}_{}'.format(self.instrument.lower(),
-                                                         self.aperture.lower()))
+        ensure_dir_exists(os.path.join(self.output_dir, "data"))
+        self.data_dir = os.path.join(
+            self.output_dir,
+            "data/{}_{}".format(self.instrument.lower(), self.aperture.lower()),
+        )
         ensure_dir_exists(self.data_dir)
 
-        # Locate the record of most recent MAST search; use this time
+        # Locate the record of most recent time the monitor was run
         self.query_start = self.most_recent_search()
-        # get the data of the plots previously created and set the query start date
-        self.prev_data = None
         self.output_file_name = os.path.join(self.output_dir, "wata_layout.html")
-        logging.info('\tNew output plot file will be written as: {}'.format(self.output_file_name))
-        if os.path.isfile(self.output_file_name):
-            self.prev_data, self.query_start = self.get_data_from_html(self.output_file_name)
-            logging.info('\tPrevious data read from html file: {}'.format(self.output_file_name))
-            # copy this plot to a previous version
-            shutil.copyfile(self.output_file_name, os.path.join(self.output_dir, "prev_wata_layout.html"))
-        # fail save - start from the beginning if there is no html file
-        else:
-            self.query_start = self.query_very_beginning
-            logging.info('\tPrevious output html file not found. Starting MAST query from Jan 28, 2022 == First JWST images (MIRI)')
 
         # Use the current time as the end time for MAST query
         self.query_end = Time.now().mjd
-        logging.info('\tQuery times: {} {}'.format(self.query_start, self.query_end))
-
-        # Query for data using the aperture and the time of the
-        # most recent previous search as the starting time
+        logging.info("\tQuery times: {} {}".format(self.query_start, self.query_end))
 
-        # via MAST:
-        # new_entries = monitor_utils.mast_query_ta(
-        #     self.instrument, self.aperture, self.query_start, self.query_end)
-
-        # via django model:
+        # Obtain all entries with instrument/aperture combinations:
         new_entries = monitor_utils.model_query_ta(
-            self.instrument, self.aperture, self.query_start, self.query_end)
+            self.instrument, self.aperture, self.query_start, self.query_end
+        )
         wata_entries = len(new_entries)
-        logging.info('\tQuery has returned {} WATA files for {}, {}.'.format(wata_entries, self.instrument, self.aperture))
+        logging.info(
+            "\tQuery has returned {} WATA files for {}, {}.".format(
+                wata_entries, self.instrument, self.aperture
+            )
+        )
 
         # Filter new entries to only keep uncal files
         new_entries = self.pull_filenames(new_entries)
         new_entries = self.get_uncal_names(new_entries)
         wata_entries = len(new_entries)
-        logging.info('\tThere are {} uncal TA files to run the WATA monitor.'.format(wata_entries))
+        logging.info(
+            "\tThere are {} uncal TA files to run the WATA monitor.".format(
+                wata_entries
+            )
+        )
 
-        # Get full paths to the files
+        # Check if filenames RootFileInfo model are in data storgage
         new_filenames = []
         for filename_of_interest in new_entries:
-            if (self.prev_data is not None
-                    and filename_of_interest in self.prev_data['filename'].values):
-                logging.warning('\t\tFile {} already in previous data. Skipping.'.format(filename_of_interest))
+            if self.file_exists_in_database(filename_of_interest):
+                logging.warning(
+                    "\t\tFile {} in database already, passing.".format(
+                        filename_of_interest
+                    )
+                )
                 continue
-            try:
-                new_filenames.append(filesystem_path(filename_of_interest))
-                logging.warning('\tFile {} included for processing.'.format(filename_of_interest))
-            except FileNotFoundError:
-                logging.warning('\t\tUnable to locate {} in filesystem. Not including in processing.'.format(filename_of_interest))
-
+            else:
+                try:
+                    new_filenames.append(filesystem_path(filename_of_interest))
+                    logging.warning(
+                        "\t\tFile {} included for processing.".format(
+                            filename_of_interest
+                        )
+                    )
+                except FileNotFoundError:
+                    logging.warning(
+                        "\t\tUnable to locate {} in filesystem. Not including in processing.".format(
+                            filename_of_interest
+                        )
+                    )
+
+        # If there are no new files, monitor is skipped
         if len(new_filenames) == 0:
-            logging.warning('\t\t ** Unable to locate any file in filesystem. Nothing to process. ** ')
-
-        # Run the monitor on any new files
-        self.script, self.div, self.wata_data = None, None, None
-        monitor_run = False
-        if len(new_filenames) > 0:   # new data was found
-            # get the data
-            self.new_wata_data, no_ta_ext_msgs = self.get_wata_data(new_filenames)
+            logging.info(
+                "\t\t ** Unable to locate any file in filesystem. Nothing to process. ** "
+            )
+            logging.info("\tWATA monitor skipped. No WATA data found.")
+            monitor_run = False
+        else:
+            # Run the monitor on any new files
+            # self.wata_data is a pandas dataframe
+            self.wata_data, no_ta_ext_msgs = self.get_wata_data(new_filenames)
+
+            # Log msgs from TA files.
             if len(no_ta_ext_msgs) >= 1:
                 for item in no_ta_ext_msgs:
                     logging.info(item)
-            if self.new_wata_data is not None:
-                # concatenate with previous data
-                if self.prev_data is not None:
-                    self.wata_data = pd.concat([self.prev_data, self.new_wata_data])
-                    logging.info('\tData from previous html output file and new data concatenated.')
-                else:
-                    self.wata_data = self.new_wata_data
-                    logging.info('\tOnly new data was found - no previous html file.')
             else:
-                logging.info('\tWATA monitor skipped. No WATA data found.')
-        # make sure to return the old data if no new data is found
-        elif self.prev_data is not None:
-            self.wata_data = self.prev_data
-            logging.info('\tNo new data found. Using data from previous html output file.')
-        # do the plots if there is any data
-        if self.wata_data is not None:
-            self.script, self.div = self.mk_plt_layout()
+                logging.info("\t No TA Ext Msgs Found")
+
+            # Add WATA data to stats table.
+            self.add_wata_data()
+
+            # Generate plot -- the database is queried in mk_plt_layout().
+            self.mk_plt_layout()
+            logging.info(
+                "\tNew output plot file will be written as: {}".format(
+                    self.output_file_name
+                )
+            )
+            # Once data is added to database table and plots are made, the
+            # monitor has run successfully.
             monitor_run = True
-            logging.info('\tOutput html plot file created: {}'.format(self.output_file_name))
-            wata_files_used4plots = len(self.wata_data['visit_id'])
-            logging.info('\t{} WATA files were used to make plots.'.format(wata_files_used4plots))
+            wata_files_used4plots = len(self.wata_data["visit_id"])
+            logging.info(
+                "\t{} WATA files were used to make plots.".format(wata_files_used4plots)
+            )
+
             # update the list of successful and failed TAs
             self.update_ta_success_txtfile()
-            logging.info('\tWATA status file was updated')
-        else:
-            logging.info('\tWATA monitor skipped.')
-
-        # Update the query history
-        new_entry = {'instrument': self.instrument,
-                     'aperture': self.aperture,
-                     'start_time_mjd': self.query_start,
-                     'end_time_mjd': self.query_end,
-                     'entries_found': wata_entries,
-                     'files_found': len(new_filenames),
-                     'run_monitor': monitor_run,
-                     'entry_date': datetime.now()}
 
-        with engine.begin() as connection:
-            connection.execute(self.query_table.__table__.insert(), new_entry)
-        logging.info('\tUpdated the query history table')
+            logging.info("\tWATA status file was updated")
 
-        logging.info('WATA Monitor completed successfully.')
-
-
-if __name__ == '__main__':
-
-    module = os.path.basename(__file__).strip('.py')
+        # Update the query history
+        new_entry = {
+            "instrument": self.instrument,
+            "aperture": self.aperture,
+            "start_time_mjd": self.query_start,
+            "end_time_mjd": self.query_end,
+            "entries_found": wata_entries,
+            "files_found": len(new_filenames),
+            "run_monitor": monitor_run,
+            "entry_date": datetime.now(tz=timezone.utc),
+        }
+
+        entry = self.query_table(**new_entry)
+        entry.save()
+        logging.info("\tUpdated the query history table")
+
+        logging.info("WATA Monitor completed successfully.")
+
+
+if __name__ == "__main__":
+    module = os.path.basename(__file__).strip(".py")
     start_time, log_file = monitor_utils.initialize_instrument_monitor(module)
 
     monitor = WATA()
diff --git a/jwql/pull_jwql_branch.sh b/jwql/pull_jwql_branch.sh
index ed0dceeaa..6c4bcbf94 100644
--- a/jwql/pull_jwql_branch.sh
+++ b/jwql/pull_jwql_branch.sh
@@ -62,12 +62,12 @@ echo "Reset: $reset";
 echo "Notify: $notify $recipient";
 
 # 1. Pull updated code from GitHub deployment branch (keep second checkout in case its already defined for some weird reason)
-git fetch origin
-git checkout -b $branch_name --track origin/$branch_name
+git fetch upstream
+git checkout -b $branch_name --track upstream/$branch_name
 git checkout $branch_name
-git fetch origin $branch_name
-git pull origin $branch_name
-git fetch origin --tags
+git fetch upstream $branch_name
+git pull upstream $branch_name
+git fetch upstream --tags
 
 # 2. Bring the service down
 if [ "$reset" = true ]; then
diff --git a/jwql/tests/test_utils.py b/jwql/tests/test_utils.py
index ecc34790b..31bfc802c 100644
--- a/jwql/tests/test_utils.py
+++ b/jwql/tests/test_utils.py
@@ -430,35 +430,6 @@ def test_filename_parser(filename, solution):
     assert filename_parser(filename) == solution
 
 
-@pytest.mark.skipif(ON_GITHUB_ACTIONS, reason='Requires access to central storage.')
-def test_filename_parser_whole_filesystem():
-    """Test the filename_parser on all files currently in the filesystem."""
-    # Get all files
-    filesystem_dir = get_config()['filesystem']
-    all_files = []
-    for dir_name, _, file_list in os.walk(filesystem_dir):
-        for file in file_list:
-            if 'public' in file or 'proprietary' in file:
-                if file.endswith('.fits'):
-                    all_files.append(os.path.join(dir_name, file))
-
-    # Run the filename_parser on all files
-    bad_filenames = []
-    for filepath in all_files:
-        try:
-            filename_parser(filepath)
-        except ValueError:
-            bad_filenames.append(os.path.basename(filepath))
-
-    # Determine if the test failed
-    fail = bad_filenames != []
-    failure_msg = '{} files could not be successfully parsed: \n - {}'.\
-        format(len(bad_filenames), '\n - '.join(bad_filenames))
-
-    # Check which ones failed
-    assert not fail, failure_msg
-
-
 def test_filename_parser_non_jwst():
     """Attempt to generate a file parameter dictionary from a file
     that is not formatted in the JWST naming convention. Ensure the
diff --git a/jwql/utils/constants.py b/jwql/utils/constants.py
index 77d1c7a50..e56d33da9 100644
--- a/jwql/utils/constants.py
+++ b/jwql/utils/constants.py
@@ -470,7 +470,6 @@
         "F170LP",
         "F290LP",
         "OPAQUE",
-        "P750L",
     ],
 }
 
@@ -716,7 +715,7 @@
     "niriss_readnoise_query_history", "niriss_readnoise_stats",
     "nirspec_readnoise_query_history", "nirspec_readnoise_stats",
     "miri_ta_query_history", "miri_ta_stats",
-    "nirspec_ta_query_history", "nirspec_ta_stats"
+    "nirspec_ta_query_history", "nirspec_ta_stats", "nirspec_wata_stats", "nirspec_msata_stats"
 ]
 
 # Suffix for msa files
@@ -786,7 +785,7 @@
 ]
 
 # Possible suffix types for AMI files
-NIRISS_AMI_SUFFIX_TYPES = ["amiavg", "aminorm", "ami", "psf-amiavg"]
+NIRISS_AMI_SUFFIX_TYPES = ["amiavg", "aminorm", "ami", "psf-amiavg", "psf-ami-oi", "ami-oi", "aminorm-oi", "amimulti-oi", "amilg"]
 
 # Determine if the code is being run as part of CI checking on github
 ON_GITHUB_ACTIONS = '/home/runner' in os.path.expanduser('~') or '/Users/runner' in os.path.expanduser('~')
@@ -1045,6 +1044,7 @@ class QueryConfigKeys:
 MAX_LEN_DIFF_IMAGE = 1000
 MAX_LEN_FILENAME = 1000
 MAX_LEN_FILTER = 7
+MAX_LEN_GENERIC_TEXT = 100
 MAX_LEN_GRATING = 40
 MAX_LEN_INSTRUMENT = 7
 MAX_LEN_MNEMONIC = 40
@@ -1059,3 +1059,4 @@ class QueryConfigKeys:
 MAX_LEN_TIME = 50
 MAX_LEN_TYPE = 40
 MAX_LEN_USER = 50
+MAX_LEN_VISIT = 30
diff --git a/jwql/utils/utils.py b/jwql/utils/utils.py
index e0794cc1b..9113169f5 100644
--- a/jwql/utils/utils.py
+++ b/jwql/utils/utils.py
@@ -530,7 +530,8 @@ def filename_parser(filename):
         time_series,
         time_series_2c,
         guider,
-        guider_segment]
+        guider_segment
+    ]
 
     filename_type_names = [
         'stage_1_and_2',
@@ -652,7 +653,7 @@ def filesystem_path(filename, check_existence=True, search=None):
         elif os.path.isfile(full_path_proprietary):
             full_path = full_path_proprietary
         else:
-            raise FileNotFoundError('{} is not in the predicted location: {}'.format(filename, full_path))
+            raise FileNotFoundError('{} is not in the expected location: {}'.format(filename, full_path))
 
     return full_path
 
diff --git a/jwql/website/apps/jwql/data_containers.py b/jwql/website/apps/jwql/data_containers.py
index 1300a6b6a..6b9ac99f6 100644
--- a/jwql/website/apps/jwql/data_containers.py
+++ b/jwql/website/apps/jwql/data_containers.py
@@ -461,7 +461,10 @@ def get_additional_exposure_info(root_file_infos, image_info):
         # get_image_info() has already globbed over the directory with the files and
         # returned the list of existing suffixes, so we shouldn't need to check for
         # file existence here.
-        file_path = filesystem_path(filename, check_existence=True)
+        try:
+            file_path = filesystem_path(filename, check_existence=True)
+        except FileNotFoundError as e:
+            raise e
 
         header = fits.getheader(file_path)
         header_sci = fits.getheader(file_path, 1)
@@ -663,6 +666,30 @@ def get_anomaly_form(request, inst, file_root):
     return form
 
 
+def get_group_anomalies(file_root):
+    """Generate form data for context
+
+    Parameters
+    ----------
+    file_root : str
+        FITS filename of selected image in filesystem. May be a
+        file or group root name.
+
+    Returns
+    -------
+    group_anomaly_dict dict
+        root file name key with string of anomalies
+    """
+    # Check for group root name
+    rootfileinfo_set = RootFileInfo.objects.filter(root_name__startswith=file_root).order_by("root_name")
+    group_anomaly_dict = {}
+    for rootfileinfo in rootfileinfo_set:
+        anomalies_list = get_current_flagged_anomalies([rootfileinfo])
+        anomalies_string = ', '.join(anomalies_list)
+        group_anomaly_dict[rootfileinfo.root_name] = anomalies_string
+    return group_anomaly_dict
+
+
 def get_dashboard_components(request):
     """Build and return a Dashboard class.
 
@@ -1203,7 +1230,10 @@ def get_header_info(filename, filetype):
     header_info = {}
 
     # Open the file
-    fits_filepath = filesystem_path(filename, search=f'*_{filetype}.fits')
+    try:
+        fits_filepath = filesystem_path(filename, search=f'*_{filetype}.fits')
+    except FileNotFoundError as e:
+        raise e
     hdulist = fits.open(fits_filepath)
 
     # Extract header information from file
diff --git a/jwql/website/apps/jwql/forms.py b/jwql/website/apps/jwql/forms.py
index f9ce45b7b..90c43cafe 100644
--- a/jwql/website/apps/jwql/forms.py
+++ b/jwql/website/apps/jwql/forms.py
@@ -160,7 +160,7 @@ class JwqlQueryForm(BaseForm):
     num_choices = [(50, 50), (100, 100), (200, 200), (500, 500)]
     num_per_page = forms.ChoiceField(
         required=True,
-        choices=num_choices, initial=num_choices[1],
+        choices=num_choices, initial=num_choices[3],
         widget=forms.RadioSelect)
 
     # instrument specific parameters
diff --git a/jwql/website/apps/jwql/migrations/0024_nirspecmsatastats_nirspecwatastats_and_more.py b/jwql/website/apps/jwql/migrations/0024_nirspecmsatastats_nirspecwatastats_and_more.py
new file mode 100644
index 000000000..938d4e443
--- /dev/null
+++ b/jwql/website/apps/jwql/migrations/0024_nirspecmsatastats_nirspecwatastats_and_more.py
@@ -0,0 +1,115 @@
+# Generated by Django 4.2.6 on 2024-05-07 15:15
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('jwql', '0023_centralstorage_fgsanomaly_filesystemcharacteristics_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='NIRSpecMsataStats',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('filename', models.CharField(blank=True, max_length=1000, null=True)),
+                ('date_obs', models.DateTimeField(blank=True, null=True)),
+                ('visit_id', models.CharField(blank=True, max_length=30, null=True)),
+                ('tafilter', models.CharField(blank=True, max_length=7, null=True)),
+                ('detector', models.CharField(blank=True, max_length=40, null=True)),
+                ('readout', models.CharField(blank=True, max_length=40, null=True)),
+                ('subarray', models.CharField(blank=True, max_length=40, null=True)),
+                ('num_refstars', models.IntegerField(blank=True, null=True)),
+                ('ta_status', models.CharField(blank=True, max_length=1000, null=True)),
+                ('v2halffacet', models.FloatField(blank=True, null=True)),
+                ('v3halffacet', models.FloatField(blank=True, null=True)),
+                ('v2msactr', models.FloatField(blank=True, null=True)),
+                ('v3msactr', models.FloatField(blank=True, null=True)),
+                ('lsv2offset', models.FloatField(blank=True, null=True)),
+                ('lsv3offset', models.FloatField(blank=True, null=True)),
+                ('lsoffsetmag', models.FloatField(blank=True, null=True)),
+                ('lsrolloffset', models.FloatField(blank=True, null=True)),
+                ('lsv2sigma', models.FloatField(blank=True, null=True)),
+                ('lsv3sigma', models.FloatField(blank=True, null=True)),
+                ('lsiterations', models.IntegerField(blank=True, null=True)),
+                ('guidestarid', models.IntegerField(blank=True, null=True)),
+                ('guidestarx', models.FloatField(blank=True, null=True)),
+                ('guidestary', models.FloatField(blank=True, null=True)),
+                ('guidestarroll', models.FloatField(blank=True, null=True)),
+                ('samx', models.FloatField(blank=True, null=True)),
+                ('samy', models.FloatField(blank=True, null=True)),
+                ('samroll', models.FloatField(blank=True, null=True)),
+                ('box_peak_value', django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=None)),
+                ('reference_star_mag', django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=None)),
+                ('convergence_status', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=100, null=True), size=None)),
+                ('reference_star_number', django.contrib.postgres.fields.ArrayField(base_field=models.IntegerField(), size=None)),
+                ('lsf_removed_status', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=100, null=True), size=None)),
+                ('lsf_removed_reason', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(blank=True, max_length=100, null=True), size=None)),
+                ('lsf_removed_x', django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=None)),
+                ('lsf_removed_y', django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=None)),
+                ('planned_v2', django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=None)),
+                ('planned_v3', django.contrib.postgres.fields.ArrayField(base_field=models.FloatField(), size=None)),
+                ('stars_in_fit', models.IntegerField(blank=True, null=True)),
+                ('entry_date', models.DateTimeField(blank=True, null=True)),
+            ],
+            options={
+                'db_table': 'nirspec_msata_stats',
+                'managed': True,
+                'unique_together': {('id', 'entry_date')},
+            },
+        ),
+        migrations.CreateModel(
+            name='NIRSpecWataStats',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('filename', models.CharField(blank=True, max_length=1000, null=True)),
+                ('date_obs', models.DateTimeField(blank=True, null=True)),
+                ('visit_id', models.CharField(blank=True, max_length=30, null=True)),
+                ('tafilter', models.CharField(blank=True, max_length=7, null=True)),
+                ('readout', models.CharField(blank=True, max_length=40, null=True)),
+                ('ta_status', models.CharField(blank=True, max_length=100, null=True)),
+                ('star_name', models.IntegerField(blank=True, null=True)),
+                ('star_ra', models.FloatField(blank=True, null=True)),
+                ('star_dec', models.FloatField(blank=True, null=True)),
+                ('star_mag', models.FloatField(blank=True, null=True)),
+                ('star_catalog', models.IntegerField(blank=True, null=True)),
+                ('planned_v2', models.FloatField(blank=True, null=True)),
+                ('planned_v3', models.FloatField(blank=True, null=True)),
+                ('stamp_start_col', models.IntegerField(blank=True, null=True)),
+                ('stamp_start_row', models.IntegerField(blank=True, null=True)),
+                ('star_detector', models.CharField(blank=True, max_length=40, null=True)),
+                ('max_val_box', models.FloatField(blank=True, null=True)),
+                ('max_val_box_col', models.IntegerField(blank=True, null=True)),
+                ('max_val_box_row', models.IntegerField(blank=True, null=True)),
+                ('iterations', models.IntegerField(blank=True, null=True)),
+                ('corr_col', models.IntegerField(blank=True, null=True)),
+                ('corr_row', models.IntegerField(blank=True, null=True)),
+                ('stamp_final_col', models.FloatField(blank=True, null=True)),
+                ('stamp_final_row', models.FloatField(blank=True, null=True)),
+                ('detector_final_col', models.FloatField(blank=True, null=True)),
+                ('detector_final_row', models.FloatField(blank=True, null=True)),
+                ('final_sci_x', models.FloatField(blank=True, null=True)),
+                ('final_sci_y', models.FloatField(blank=True, null=True)),
+                ('measured_v2', models.FloatField(blank=True, null=True)),
+                ('measured_v3', models.FloatField(blank=True, null=True)),
+                ('ref_v2', models.FloatField(blank=True, null=True)),
+                ('ref_v3', models.FloatField(blank=True, null=True)),
+                ('v2_offset', models.FloatField(blank=True, null=True)),
+                ('v3_offset', models.FloatField(blank=True, null=True)),
+                ('sam_x', models.FloatField(blank=True, null=True)),
+                ('sam_y', models.FloatField(blank=True, null=True)),
+                ('entry_date', models.DateTimeField(blank=True, null=True)),
+            ],
+            options={
+                'db_table': 'nirspec_wata_stats',
+                'managed': True,
+                'unique_together': {('id', 'entry_date')},
+            },
+        ),
+        migrations.DeleteModel(
+            name='NIRSpecTaStats',
+        ),
+    ]
diff --git a/jwql/website/apps/jwql/monitor_models/ta.py b/jwql/website/apps/jwql/monitor_models/ta.py
index f2eae2846..34ef20988 100644
--- a/jwql/website/apps/jwql/monitor_models/ta.py
+++ b/jwql/website/apps/jwql/monitor_models/ta.py
@@ -24,6 +24,7 @@
     For more information please see:
         ```https://docs.djangoproject.com/en/2.0/topics/db/models/```
 """
+
 # This is an auto-generated Django model module.
 # Feel free to rename the models, but don't rename db_table values or field names.
 from django.contrib.postgres.fields import ArrayField
@@ -32,14 +33,14 @@
 from jwql.utils.constants import (
     MAX_LEN_APERTURE,
     MAX_LEN_DETECTOR,
-    MAX_LEN_TIME,
     MAX_LEN_FILENAME,
+    MAX_LEN_FILTER,
+    MAX_LEN_GENERIC_TEXT,
     MAX_LEN_INSTRUMENT,
-    MAX_LEN_NGROUPS,
-    MAX_LEN_NINTS,
     MAX_LEN_PATH,
     MAX_LEN_READPATTERN,
     MAX_LEN_SUBARRAY,
+    MAX_LEN_VISIT,
 )
 
 
@@ -55,8 +56,8 @@ class MIRITaQueryHistory(models.Model):
 
     class Meta:
         managed = True
-        db_table = 'miri_ta_query_history'
-        unique_together = (('id', 'entry_date'),)
+        db_table = "miri_ta_query_history"
+        unique_together = (("id", "entry_date"),)
 
 
 class MIRITaStats(models.Model):
@@ -73,8 +74,8 @@ class MIRITaStats(models.Model):
 
     class Meta:
         managed = True
-        db_table = 'miri_ta_stats'
-        unique_together = (('id', 'entry_date'),)
+        db_table = "miri_ta_stats"
+        unique_together = (("id", "entry_date"),)
 
 
 class NIRSpecTaQueryHistory(models.Model):
@@ -89,46 +90,103 @@ class NIRSpecTaQueryHistory(models.Model):
 
     class Meta:
         managed = True
-        db_table = 'nirspec_ta_query_history'
-        unique_together = (('id', 'entry_date'),)
+        db_table = "nirspec_ta_query_history"
+        unique_together = (("id", "entry_date"),)
+
+
+class NIRSpecWataStats(models.Model):
+    filename = models.CharField(max_length=MAX_LEN_FILENAME, blank=True, null=True)
+    date_obs = models.DateTimeField(blank=True, null=True)
+    visit_id = models.CharField(max_length=MAX_LEN_VISIT, blank=True, null=True)
+    tafilter = models.CharField(max_length=MAX_LEN_FILTER, blank=True, null=True)
+    readout = models.CharField(max_length=MAX_LEN_READPATTERN, blank=True, null=True)
+    ta_status = models.CharField(max_length=MAX_LEN_GENERIC_TEXT, blank=True, null=True)
+    star_name = models.IntegerField(blank=True, null=True)
+    star_ra = models.FloatField(blank=True, null=True)
+    star_dec = models.FloatField(blank=True, null=True)
+    star_mag = models.FloatField(blank=True, null=True)
+    star_catalog = models.IntegerField(blank=True, null=True)
+    planned_v2 = models.FloatField(blank=True, null=True)
+    planned_v3 = models.FloatField(blank=True, null=True)
+    stamp_start_col = models.IntegerField(blank=True, null=True)
+    stamp_start_row = models.IntegerField(blank=True, null=True)
+    star_detector = models.CharField(max_length=MAX_LEN_DETECTOR, blank=True, null=True)
+    max_val_box = models.FloatField(blank=True, null=True)
+    max_val_box_col = models.IntegerField(blank=True, null=True)
+    max_val_box_row = models.IntegerField(blank=True, null=True)
+    iterations = models.IntegerField(blank=True, null=True)
+    corr_col = models.IntegerField(blank=True, null=True)
+    corr_row = models.IntegerField(blank=True, null=True)
+    stamp_final_col = models.FloatField(blank=True, null=True)
+    stamp_final_row = models.FloatField(blank=True, null=True)
+    detector_final_col = models.FloatField(blank=True, null=True)
+    detector_final_row = models.FloatField(blank=True, null=True)
+    final_sci_x = models.FloatField(blank=True, null=True)
+    final_sci_y = models.FloatField(blank=True, null=True)
+    measured_v2 = models.FloatField(blank=True, null=True)
+    measured_v3 = models.FloatField(blank=True, null=True)
+    ref_v2 = models.FloatField(blank=True, null=True)
+    ref_v3 = models.FloatField(blank=True, null=True)
+    v2_offset = models.FloatField(blank=True, null=True)
+    v3_offset = models.FloatField(blank=True, null=True)
+    sam_x = models.FloatField(blank=True, null=True)
+    sam_y = models.FloatField(blank=True, null=True)
+    entry_date = models.DateTimeField(blank=True, null=True)
+
+    class Meta:
+        managed = True
+        db_table = "nirspec_wata_stats"
+        unique_together = (("id", "entry_date"),)
 
 
-class NIRSpecTaStats(models.Model):
-    entry_date = models.DateTimeField(blank=True, null=True)
-    uncal_filename = models.CharField(max_length=MAX_LEN_FILENAME, blank=True, null=True)
-    aperture = models.CharField(max_length=MAX_LEN_APERTURE, blank=True, null=True)
+class NIRSpecMsataStats(models.Model):
+    filename = models.CharField(max_length=MAX_LEN_FILENAME, blank=True, null=True)
+    date_obs = models.DateTimeField(blank=True, null=True)
+    visit_id = models.CharField(max_length=MAX_LEN_VISIT, blank=True, null=True)
+    tafilter = models.CharField(max_length=MAX_LEN_FILTER, blank=True, null=True)
     detector = models.CharField(max_length=MAX_LEN_DETECTOR, blank=True, null=True)
+    readout = models.CharField(max_length=MAX_LEN_READPATTERN, blank=True, null=True)
     subarray = models.CharField(max_length=MAX_LEN_SUBARRAY, blank=True, null=True)
-    read_pattern = models.CharField(max_length=MAX_LEN_READPATTERN, blank=True, null=True)
-    nints = models.CharField(max_length=MAX_LEN_NINTS, blank=True, null=True)
-    ngroups = models.CharField(max_length=MAX_LEN_NGROUPS, blank=True, null=True)
-    expstart = models.CharField(max_length=MAX_LEN_TIME, blank=True, null=True)
-    full_image_mean = models.FloatField(blank=True, null=True)
-    full_image_stddev = models.FloatField(blank=True, null=True)
-    full_image_n = ArrayField(models.FloatField())
-    full_image_bin_centers = ArrayField(models.FloatField())
-    diff_image_mean = models.FloatField(blank=True, null=True)
-    diff_image_stddev = models.FloatField(blank=True, null=True)
-    diff_image_n = ArrayField(models.FloatField())
-    diff_image_bin_centers = ArrayField(models.FloatField())
-    amp1_mean = models.FloatField(blank=True, null=True)
-    amp1_stddev = models.FloatField(blank=True, null=True)
-    amp1_n = ArrayField(models.FloatField())
-    amp1_bin_centers = ArrayField(models.FloatField())
-    amp2_mean = models.FloatField(blank=True, null=True)
-    amp2_stddev = models.FloatField(blank=True, null=True)
-    amp2_n = ArrayField(models.FloatField())
-    amp2_bin_centers = ArrayField(models.FloatField())
-    amp3_mean = models.FloatField(blank=True, null=True)
-    amp3_stddev = models.FloatField(blank=True, null=True)
-    amp3_n = ArrayField(models.FloatField())
-    amp3_bin_centers = ArrayField(models.FloatField())
-    amp4_mean = models.FloatField(blank=True, null=True)
-    amp4_stddev = models.FloatField(blank=True, null=True)
-    amp4_n = ArrayField(models.FloatField())
-    amp4_bin_centers = ArrayField(models.FloatField())
+    num_refstars = models.IntegerField(blank=True, null=True)
+    ta_status = models.CharField(max_length=MAX_LEN_FILENAME, blank=True, null=True)
+    v2halffacet = models.FloatField(blank=True, null=True)
+    v3halffacet = models.FloatField(blank=True, null=True)
+    v2msactr = models.FloatField(blank=True, null=True)
+    v3msactr = models.FloatField(blank=True, null=True)
+    lsv2offset = models.FloatField(blank=True, null=True)
+    lsv3offset = models.FloatField(blank=True, null=True)
+    lsoffsetmag = models.FloatField(blank=True, null=True)
+    lsrolloffset = models.FloatField(blank=True, null=True)
+    lsv2sigma = models.FloatField(blank=True, null=True)
+    lsv3sigma = models.FloatField(blank=True, null=True)
+    lsiterations = models.IntegerField(blank=True, null=True)
+    guidestarid = models.IntegerField(blank=True, null=True)
+    guidestarx = models.FloatField(blank=True, null=True)
+    guidestary = models.FloatField(blank=True, null=True)
+    guidestarroll = models.FloatField(blank=True, null=True)
+    samx = models.FloatField(blank=True, null=True)
+    samy = models.FloatField(blank=True, null=True)
+    samroll = models.FloatField(blank=True, null=True)
+    box_peak_value = ArrayField(models.FloatField())
+    reference_star_mag = ArrayField(models.FloatField())
+    convergence_status = ArrayField(
+        models.CharField(max_length=MAX_LEN_GENERIC_TEXT, blank=True, null=True)
+    )
+    reference_star_number = ArrayField(models.IntegerField())
+    lsf_removed_status = ArrayField(
+        models.CharField(max_length=MAX_LEN_GENERIC_TEXT, blank=True, null=True)
+    )
+    lsf_removed_reason = ArrayField(
+        models.CharField(max_length=MAX_LEN_GENERIC_TEXT, blank=True, null=True)
+    )
+    lsf_removed_x = ArrayField(models.FloatField())
+    lsf_removed_y = ArrayField(models.FloatField())
+    planned_v2 = ArrayField(models.FloatField())
+    planned_v3 = ArrayField(models.FloatField())
+    stars_in_fit = models.IntegerField(blank=True, null=True)
+    entry_date = models.DateTimeField(blank=True, null=True)
 
     class Meta:
         managed = True
-        db_table = 'nirspec_ta_stats'
-        unique_together = (('id', 'entry_date'),)
+        db_table = "nirspec_msata_stats"
+        unique_together = (("id", "entry_date"),)
diff --git a/jwql/website/apps/jwql/static/css/jwql.css b/jwql/website/apps/jwql/static/css/jwql.css
index 26229492a..bc8520faf 100644
--- a/jwql/website/apps/jwql/static/css/jwql.css
+++ b/jwql/website/apps/jwql/static/css/jwql.css
@@ -620,6 +620,11 @@
       font-size: 0.65rem;
   }
 
+  .wrapped-error-text {
+    max-width: 650px; /* Set the maximum width */
+    word-wrap: break-word; /* Ensure words break if they exceed the width */
+}
+
   /*Format the version identifier text in bottom corner*/
   #version-div {
     float: right;
diff --git a/jwql/website/apps/jwql/static/js/jwql.js b/jwql/website/apps/jwql/static/js/jwql.js
index df47c63e7..4d9a783c4 100644
--- a/jwql/website/apps/jwql/static/js/jwql.js
+++ b/jwql/website/apps/jwql/static/js/jwql.js
@@ -310,13 +310,15 @@ function determine_page_title_obs(instrument, proposal, observation) {
     }
 }
 
+
 /**
- * Construct a 4-column table from an input dictionary. The 4 columns
- * correspond to:  key, value, key, value.
- * @dictionary {dict} jsonified dictionary
+ * Populate a user provided html table from a dictionary
+ * @param {Object} dictionary - Python style dictionary
+ * @param {String} table_name - The table name in that will be updated
+ * @param {Integer} nr_paired_columns - How many paired columns per row.  One "paired column" is 2 columns (1 key, 1 value)
  */
-function make_table_from_dict(dictionary) {
-    var tableBody = document.getElementById("table-body");
+function make_table_from_dict(dictionary, table_name, nr_paired_columns) {
+    var tableBody = document.getElementById(table_name);
     // Extract keys and values from the dictionary
     var keys = Object.keys(dictionary);
     var values = Object.values(dictionary);
@@ -326,19 +328,19 @@ function make_table_from_dict(dictionary) {
     var maxLength = keys.length
 
     // Populate the table dynamically
-    for (var i = 0; i < maxLength; i+=2) {
+    // Create a row with dynamic amount of paired_columns (Key Column with Value Column)
+    var table_index = 0
+    for (var i = 0; i < maxLength; i+=nr_paired_columns) {
         var row = document.createElement("tr");
-        var row = tableBody.insertRow(i/2)
-        var cell1 = row.insertCell(0)
-        var cell2 = row.insertCell(1)
-        var cell3 = row.insertCell(2)
-        var cell4 = row.insertCell(3)
-
-        cell1.textContent = i < keys.length ? keys[i]+':' : "";
-        cell2.textContent = i < keys.length ? values[i] : "";
-        cell3.textContent = (i+1) < keys.length ? keys[i+1]+':' : "";
-        cell4.textContent = (i+1) < keys.length ? values[i+1] : "";
-
+        var row = tableBody.insertRow(i/nr_paired_columns)
+        // Fill cells in as pairs
+        for (var columnx = 0; columnx < nr_paired_columns*2; columnx+=2){
+            var key_cell = row.insertCell(columnx)
+            var value_cell = row.insertCell(columnx + 1)
+            key_cell.textContent = i < keys.length ? keys[table_index]+':' : "";
+            value_cell.textContent = i < keys.length ? values[table_index] : "";
+            table_index++
+        }
         tableBody.appendChild(row);
     }
     return tableBody;
diff --git a/jwql/website/apps/jwql/templates/error_view.html b/jwql/website/apps/jwql/templates/error_view.html
new file mode 100644
index 000000000..31f9ac041
--- /dev/null
+++ b/jwql/website/apps/jwql/templates/error_view.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block preamble %}
+
+    <title>There seems to be an issue - JWQL</title>
+
+{% endblock %}
+
+{% block content %}
+
+    <main role="main" class="container">
+
+        <!--Add JavaScript to make text fade in after video loads-->
+        <script>
+            $(document).ready(function() {
+                $("#space_404_text").delay(500).fadeIn(200);
+            });
+        </script>
+
+        <!-- The video -->
+        <video autoplay muted loop id="space_404">
+          <source src={{ static("img/flyby.mov") }} type="video/mp4" alt="">
+        </video>
+
+        <!-- Overlay text to describe the video -->
+        <div id="space_404_text">
+          <h1>Don't Panic!</h1>
+          <p class="wrapped-error-text">{{ error_message }}</p>
+          <p class="wrapped-error-text">{{ exception_message }}</p>
+          <img src={{ static("img/spacecat.jpg") }} alt='SpaceCAT' style="width:650px;height:400px;">
+
+        </div>
+
+    </main>
+
+{% endblock %}
\ No newline at end of file
diff --git a/jwql/website/apps/jwql/templates/jwql_query.html b/jwql/website/apps/jwql/templates/jwql_query.html
index 098bdd4ae..6f007f967 100644
--- a/jwql/website/apps/jwql/templates/jwql_query.html
+++ b/jwql/website/apps/jwql/templates/jwql_query.html
@@ -573,8 +573,9 @@ <h1>Dynamic Query Form</h1>
                     </div>
                     <hr class="col-md-12">
                     <div class='form-group'>
-                        <input type="submit" value="Submit" class="btn btn-primary" name="jwstqueryform" />
-                        <input type="reset" value="Clear Form" class="btn btn-primary mx-4" name="jwstqueryform" onclick="hide_all();" />
+                        <input type="submit" value="Submit" class="btn btn-primary" name="submit_jwstqueryform" />
+                        <input type="submit" value="Download" class="btn btn-primary" name="download_jwstqueryform" />
+                        <input type="reset" value="Clear Form" class="btn btn-primary mx-4" name="reset_jwstqueryform" onclick="hide_all();" />
                     </div>
                 </div>
             </form>
diff --git a/jwql/website/apps/jwql/templates/view_exposure.html b/jwql/website/apps/jwql/templates/view_exposure.html
index 2a9e5cf2f..76dca636b 100644
--- a/jwql/website/apps/jwql/templates/view_exposure.html
+++ b/jwql/website/apps/jwql/templates/view_exposure.html
@@ -38,6 +38,7 @@ <h3>Exposure {{ group_root }}</h3>
             <div class="APT_parameters">Exp Start: {{ expstart_str }}</div>
         </div>
 
+
         <div class="collapsible">
             <button class="collapsible-btn btn-primary">More Exposure Info +</button>
             <div class="collapsible-content">
@@ -48,7 +49,7 @@ <h3>Exposure {{ group_root }}</h3>
                         <script>
                         // Line below needed to put dictionary into the proper format
                         py_dict = {{ additional_info | safe }};
-                        make_table_from_dict(py_dict)
+                        make_table_from_dict(py_dict, "table-body", 2)
                         </script>
                     </tbody>
                 </table>
@@ -216,6 +217,20 @@ <h3>Exposure {{ group_root }}</h3>
 
         <div class="row">
             <!-- Display the anomaly form -->
+            <div class="col-xl-3 text-left">
+                <h5>Anomalies Within Group</h5>
+                <table id="anomaly-spread-table" class="split-dictionary">
+                    <tbody id="anomaly-table" class="alternate-rows">
+                        <!-- Table body will be populated dynamically with JavaScript -->
+                        <script>
+                            // Line below needed to put dictionary into the proper format
+                            py_dict = {{ group_anomalies | safe }};
+                            make_table_from_dict(py_dict, "anomaly-table", 1) // SEND IN ID TO UPDATE
+                            </script>
+                    </tbody>
+                </table>
+            </div>
+            <div class="col-xl-3"></div>
             <div class="col-xl-3 text-left">
                 <!--Load the file search form from the view-->
                 <div class="anomaly_form">
diff --git a/jwql/website/apps/jwql/templates/view_image.html b/jwql/website/apps/jwql/templates/view_image.html
index 90dd52c87..80bc5e58e 100644
--- a/jwql/website/apps/jwql/templates/view_image.html
+++ b/jwql/website/apps/jwql/templates/view_image.html
@@ -48,7 +48,7 @@ <h3>{{ file_root }}</h3>
                         <script>
                         // Line below needed to put dictionary into the proper format
                         py_dict = {{ additional_info | safe }};
-                        make_table_from_dict(py_dict)
+                        make_table_from_dict(py_dict, "table-body", 2)
                         </script>
                     </tbody>
                 </table>
diff --git a/jwql/website/apps/jwql/urls.py b/jwql/website/apps/jwql/urls.py
index 03b7e8708..27a38296c 100644
--- a/jwql/website/apps/jwql/urls.py
+++ b/jwql/website/apps/jwql/urls.py
@@ -85,6 +85,8 @@
     path('jwqldb/<str:tablename_param>', views.jwqldb_table_viewer, name='jwqldb_table_viewer'),
     path('log_view/', views.log_view, name='log_view'),
     path('query_submit/', views.query_submit, name='query_submit'),
+    path('query_download/', views.query_download, name='query_download'),
+
     re_path(r'^(?P<inst>({}))/$'.format(instruments), views.instrument, name='instrument'),
     re_path(r'^(?P<inst>({}))/archive/$'.format(instruments), views.archived_proposals, name='archive'),
     re_path(r'^(?P<inst>({}))/unlooked/$'.format(instruments), views.unlooked_images, name='unlooked'),
diff --git a/jwql/website/apps/jwql/views.py b/jwql/website/apps/jwql/views.py
index 0ea0281ad..cb4c31782 100644
--- a/jwql/website/apps/jwql/views.py
+++ b/jwql/website/apps/jwql/views.py
@@ -44,47 +44,48 @@
 
 import csv
 import datetime
-import json
 import glob
+import json
 import logging
-import os
 import operator
+import os
 import socket
 
 from astropy.time import Time
-from bokeh.layouts import layout
 from bokeh.embed import components
+from bokeh.layouts import layout
 from django.core.paginator import Paginator
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import redirect, render
-import numpy as np
 from sqlalchemy import inspect
 
 from jwql.database.database_interface import load_connection
 from jwql.utils import monitor_utils
+from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE, QUERY_CONFIG_TEMPLATE, URL_DICT, QueryConfigKeys
 from jwql.utils.interactive_preview_image import InteractivePreviewImg
-from jwql.utils.constants import JWST_INSTRUMENT_NAMES_MIXEDCASE, URL_DICT, QUERY_CONFIG_TEMPLATE, QueryConfigKeys
-from jwql.utils.utils import filename_parser, filesystem_path, get_base_url, get_config
-from jwql.utils.utils import get_rootnames_for_instrument_proposal, query_unformat
-
-from .data_containers import build_table
-from .data_containers import get_acknowledgements
-from .data_containers import get_additional_exposure_info
-from .data_containers import get_available_suffixes
-from .data_containers import get_anomaly_form
-from .data_containers import get_dashboard_components
-from .data_containers import get_edb_components
-from .data_containers import get_explorer_extension_names
-from .data_containers import get_header_info
-from .data_containers import get_image_info
-from .data_containers import get_instrument_looks
-from .data_containers import get_rootnames_from_query
-from .data_containers import random_404_page
-from .data_containers import text_scrape
-from .data_containers import thumbnails_ajax
-from .data_containers import thumbnails_query_ajax
-from .forms import JwqlQueryForm
-from .forms import FileSearchForm
+from jwql.utils.utils import filename_parser, get_base_url, get_config, get_rootnames_for_instrument_proposal, query_unformat
+
+from .data_containers import (
+    build_table,
+    get_acknowledgements,
+    get_additional_exposure_info,
+    get_anomaly_form,
+    get_available_suffixes,
+    get_dashboard_components,
+    get_edb_components,
+    get_explorer_extension_names,
+    get_group_anomalies,
+    get_header_info,
+    get_image_info,
+    get_instrument_looks,
+    get_rootnames_from_query,
+    random_404_page,
+    text_scrape,
+    thumbnails_ajax,
+    thumbnails_query_ajax,
+)
+from .forms import FileSearchForm, JwqlQueryForm
+
 if not os.environ.get("READTHEDOCS"):
     from .models import RootFileInfo
 from astropy.io import fits
@@ -130,6 +131,7 @@ def jwql_query(request):
             parameters[QueryConfigKeys.DATE_RANGE] = form.cleaned_data['date_range']
             parameters[QueryConfigKeys.PROPOSAL_CATEGORY] = form.cleaned_data['proposal_category']
             parameters[QueryConfigKeys.SORT_TYPE] = form.cleaned_data['sort_type']
+            parameters[QueryConfigKeys.NUM_PER_PAGE] = form.cleaned_data['num_per_page']
             parameters[QueryConfigKeys.ANOMALIES] = all_anomalies
             parameters[QueryConfigKeys.APERTURES] = all_apers
             parameters[QueryConfigKeys.FILTERS] = all_filters
@@ -142,7 +144,13 @@ def jwql_query(request):
 
             # save the query config settings to a session
             request.session['query_config'] = parameters
-            return redirect('/query_submit')
+            # Check if the download button value exists in the POST message (meaning Download was pressed)
+            download_button_value = request.POST.get('download_jwstqueryform', None)
+            if(download_button_value):
+                return redirect('/query_download')
+            else:
+                # submit was pressed go to the query_submit page
+                return redirect('/query_submit')
 
     context = {'form': form,
                'inst': ''}
@@ -771,6 +779,36 @@ def query_submit(request):
     return render(request, template, context)
 
 
+def query_download(request):
+    """Download query results in csv format
+
+    Parameters
+    ----------
+    request : HttpRequest object
+        Incoming request from the webpage.
+
+    Returns
+    -------
+    response : HttpResponse object
+        Outgoing response sent to the webpage (csv file to be downloaded)
+    """
+    parameters = request.session.get("query_config", QUERY_CONFIG_TEMPLATE.copy())
+    filtered_rootnames = get_rootnames_from_query(parameters)
+
+    today = datetime.datetime.now().strftime('%Y%m%d_%H:%M')
+    filename = f'jwql_query_{today}.csv'
+    response = HttpResponse(content_type='text/csv')
+    response['Content-Disposition'] = f'attachment; filename="{filename}"'
+
+    header_row = ["Index", "Name"]
+    writer = csv.writer(response)
+    writer.writerow(header_row)
+    for index, rootname in enumerate(filtered_rootnames):
+        writer.writerow([index, rootname])
+
+    return response
+
+
 def unlooked_images(request, inst):
     """Generate the page listing all unlooked images in the database
 
@@ -1138,6 +1176,7 @@ def view_exposure(request, inst, group_root):
 
     # Get the anomaly submission form
     form = get_anomaly_form(request, inst, group_root)
+    group_anomalies = get_group_anomalies(group_root)
 
     # if we get to this page without any navigation data,
     # previous/next buttons will be hidden
@@ -1171,6 +1210,8 @@ def view_exposure(request, inst, group_root):
 
     # Get our current views RootFileInfo model and send our "viewed/new" information
     root_file_info = RootFileInfo.objects.filter(root_name__startswith=group_root)
+    if len(root_file_info) == 0:
+        return generate_error_view(request, inst, f"No groups starting with {group_root} currently in JWQL database.")
     viewed = all([rf.viewed for rf in root_file_info])
 
     # Convert expstart from MJD to a date
@@ -1178,7 +1219,14 @@ def view_exposure(request, inst, group_root):
 
     # Create one dict of info to show at the top of the page, and another dict of info
     # to show in the collapsible text box.
-    basic_info, additional_info = get_additional_exposure_info(root_file_info, image_info)
+    try:
+        basic_info, additional_info = get_additional_exposure_info(root_file_info, image_info)
+    except FileNotFoundError as e:
+        return generate_error_view(request, inst,
+                                   "Looks like at least one of your files has not yet been ingested into the JWQL database.  \
+                                   If this is a newer observation, please wait a few hours and try again.  \
+                                   If this observation is over a day old please contact JWQL support.",
+                                   exception_message=f"Received Error: '{e}'")
 
     # Build the context
     context = {'base_url': get_base_url(),
@@ -1196,7 +1244,8 @@ def view_exposure(request, inst, group_root):
                'marked_viewed': viewed,
                'expstart_str': expstart_str,
                'basic_info': basic_info,
-               'additional_info': additional_info}
+               'additional_info': additional_info,
+               'group_anomalies': group_anomalies}
 
     return render(request, template, context)
 
@@ -1297,3 +1346,27 @@ def view_image(request, inst, file_root):
                'additional_info': additional_info}
 
     return render(request, template, context)
+
+
+def generate_error_view(request, inst, error_message, exception_message=""):
+    """Generate the error view page
+
+    Parameters
+    ----------
+    request : HttpRequest object
+        Incoming request from the webpage
+    inst : str
+        Name of JWST instrument
+    error_message : str
+        Custom Error Message to be seen in error_view.html
+    exception_message: str
+        if an exception caused this to be generated, pass the exception message along for display
+
+    Returns
+    -------
+    HttpResponse object
+        Outgoing response sent to the webpage
+    """
+    template = 'error_view.html'
+    context = {'base_url': get_base_url(), 'inst': inst, 'error_message': error_message, 'exception_message': exception_message}
+    return render(request, template, context)
diff --git a/jwql/website/jwql_proj/settings.py b/jwql/website/jwql_proj/settings.py
index a8adf9fa3..6568eceeb 100644
--- a/jwql/website/jwql_proj/settings.py
+++ b/jwql/website/jwql_proj/settings.py
@@ -38,7 +38,7 @@
     SECRET_KEY = get_config()['django_secret_key']
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = get_config()['django_debug']
 
 
 ALLOWED_HOSTS = ['*']
diff --git a/presentations/jwql_presentation.pdf b/presentations/jwql_presentation.pdf
deleted file mode 100644
index 99641c67b..000000000
Binary files a/presentations/jwql_presentation.pdf and /dev/null differ
diff --git a/presentations/jwql_tips_2019_07.pdf b/presentations/jwql_tips_2019_07.pdf
deleted file mode 100644
index 7f83548b5..000000000
Binary files a/presentations/jwql_tips_2019_07.pdf and /dev/null differ
diff --git a/presentations/jwql_web_app.pdf b/presentations/jwql_web_app.pdf
deleted file mode 100644
index cb059894e..000000000
Binary files a/presentations/jwql_web_app.pdf and /dev/null differ
diff --git a/pyproject.toml b/pyproject.toml
index b17920154..51a66c40b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,53 +3,65 @@ name = "jwql"
 description = "The James Webb Space Telescope Quicklook Project"
 readme = "README.md"
 authors = [
-  { name = "Matthew Bourque" },
-  { name = "Lauren Chambers" },
-  { name = "Misty Cracraft" },
-  { name = "Mike Engesser" },
-  { name = "Mees Fix" },
-  { name = "Joe Filippazzo" },
-  { name = "Bryan Hilbert" },
+    { name = "Matthew Bourque" },
+    { name = "Lauren Chambers" },
+    { name = "Misty Cracraft" },
+    { name = "Mike Engesser" },
+    { name = "Mees Fix" },
+    { name = "Joe Filippazzo" },
+    { name = "Bryan Hilbert" },
+]
+keywords = [
+    "astronomy",
+    "python",
+]
+classifiers = [
+    "Programming Language :: Python",
 ]
-keywords = ["astronomy", "python"]
-classifiers = ["Programming Language :: Python"]
 dependencies = [
-  "asdf",
-  "astropy",
-  "astroquery",
-  "bokeh>=3",
-  "crds",
-  "cryptography",
-  "django",
-  "inflection",
-  "jinja2",
-  "jsonschema",
-  "jwst",
-  "jwst_reffiles",
-  "matplotlib",
-  "numpy",
-  "numpydoc",
-  "pandas",
-  "psycopg2-binary",
-  "pysiaf",
-  "pyvo",
-  "scipy",
-  "sqlalchemy",
-  "stdatamodels",
-  "wtforms",
+    "asdf>=3.1.0,<4",
+    "astropy>=6.0,<7",
+    "astroquery>=0.4.7,<0.5.0",
+    "beautifulsoup4>=4.12.3,<5",
+    "bokeh>=3.4.0,<4",
+    "celery>=5.3.6,<6",
+    "crds>=11.17.19,<12",
+    "django>=5.0.3,<6",
+    "gunicorn>=22.0.0,<23.0.0",
+    "inflection>=0.5.1,<0.6",
+    "jsonschema>=4.21.1,<5",
+    "jwst>=1.13.4,<2",
+    "jwst_backgrounds>=1.2.0,<1.3.0",
+    "jwst_reffiles>=1.0.1",
+    "matplotlib>=3.8.3,<4",
+    "numpy>=1.26.4,<2",
+    "pandas>=2.2.1,<3",
+    "psycopg2-binary>=2.9.9,<3",
+    "pysiaf>=0.22.0",
+    "pyvo>=1.5.1,<2",
+    "redis>=5.0.3,<6",
+    "scipy>=1.12.0,<2",
+    "selenium>=4.18.1,<5",
+    "sqlalchemy>=2.0.29,<3",
+    "wtforms>=3.1.2,<4",
+]
+dynamic = [
+    "version",
 ]
-dynamic = ["version"]
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 test = [
-  "pytest",
-  "pytest-cov",
-  "pytest-mock",
+    "pytest",
+    "pytest-cov",
+    "pytest-mock",
 ]
 docs = [
-  "sphinx",
-  "sphinx_rtd_theme",
-  "stsci_rtd_theme",
+    "numpydoc",
+    "sphinx",
+    "sphinx_rtd_theme",
+    "stsci_rtd_theme",
+    "sphinx_automodapi",
 ]
 
 [project.license]
@@ -57,7 +69,12 @@ file = "LICENSE"
 content-type = "text/plain"
 
 [build-system]
-requires = ["setuptools>=68.0.0", "numpy", "wheel", "setuptools_scm"]
+requires = [
+    "setuptools>=68.0.0",
+    "numpy",
+    "wheel",
+    "setuptools_scm",
+]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
@@ -72,4 +89,6 @@ namespaces = false
 junit_family = "xunit2"
 
 [tool.pytest.ini_options]
-norecursedirs = ["jwql/website/apps/jwql/static"]
\ No newline at end of file
+norecursedirs = [
+    "jwql/website/apps/jwql/static",
+]
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 0edf7d9ea..000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-astropy==5.3.3
-astroquery==0.4.6
-bandit==1.7.5
-beautifulsoup4==4.12.2
-bokeh==3.3.0
-celery==5.3.4
-cryptography==41.0.7
-django==4.2.5
-inflection==0.5.1
-ipython==8.16.1
-jinja2==3.1.2
-jsonschema==4.19.1
-jwst==1.12.3
-jwst_backgrounds==1.2.0
-matplotlib==3.8.0
-nodejs==20.8.0
-numpy==1.25.2
-numpydoc==1.5.0
-pandas==2.1.1
-psycopg2-binary==2.9.7
-pysiaf==0.20.0
-pysqlite3==0.5.2
-pytest==7.4.2
-pytest-cov==4.1.0
-pytest-mock==3.11.1
-pyvo==1.4.2
-pyyaml==6.0.1
-redis==5.0.0
-ruff==0.1.6
-scipy==1.11.4
-selenium==4.13.0
-setuptools==68.2.2
-sphinx==7.2.6
-sphinx_rtd_theme==1.3.0
-sqlalchemy==2.0.23
-stdatamodels==1.8.3
-stsci_rtd_theme==1.0.0
-twine==4.0.2
-vine==5.1.0
-wtforms==3.0.1
-git+https://github.com/spacetelescope/jwst_reffiles#egg=jwst_reffiles
diff --git a/rtd_requirements.txt b/rtd_requirements.txt
deleted file mode 100644
index abac6b128..000000000
--- a/rtd_requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-sphinx_automodapi>=0.15.0
-bokeh==2.4.3
-celery==5.3.4
-cython>=3.0.0
-django==4.2.5
-docutils>=0.18.1
-jwst==1.12.3
-pygments==2.16.1
-pytest==7.4.2
-redis==5.0.0
-selenium==4.13.0
-sphinx==7.2.6
-stsci_rtd_theme==1.0.0
-tomli==2.0.1
-git+https://github.com/spacetelescope/jwst_reffiles
diff --git a/style_guide/example.py b/style_guide/example.py
index 47db3b3a0..d145529de 100644
--- a/style_guide/example.py
+++ b/style_guide/example.py
@@ -73,7 +73,7 @@
 
 # Global variables should be avoided, but if used should be named with
 # all-caps
-A_GLOBAL_VARIABLE = 'foo'  # type: str
+A_GLOBAL_VARIABLE = "foo"  # type: str
 
 
 @log_fail
@@ -92,14 +92,14 @@ def my_main_function(path: str, filter: str) -> None:
         The filter to process (e.g. "F606W").
     """
 
-    logging.info('Using {} as an input file'.format(path))
+    logging.info("Using {} as an input file".format(path))
 
     an_int = 1  # type: int
     a_float = 3.14  # type: float
     a_bool = True  # type: bool
-    a_list = ['Dog', 'Cat', 'Turtle', False, 7]  # type: List[Union[str, bool, int]]
-    a_tuple = ('Dog', 'Cat', 'Turtle', False, 7)  # type: Tuple[str, str, str, bool, int]
-    a_dict = {'key1': 'value1', 'key2': 'value2'}  # type: Dict[str, str]
+    a_list = ["Dog", "Cat", "Turtle", False, 7]  # type: List[Union[str, bool, int]]
+    a_tuple = ("Dog", "Cat", "Turtle", False, 7)  # type: Tuple[str, str, str, bool, int]
+    a_dict = {"key1": "value1", "key2": "value2"}  # type: Dict[str, str]
     an_obj = object()  # type: object
 
     result = some_other_function(an_int, a_float, a_bool, a_list, a_tuple, a_dict, an_obj)  # type: Optional[int]
@@ -117,21 +117,13 @@ def parse_args() -> argparse.Namespace:
     """
 
     # Create help strings
-    path_help = 'The path to the input file.'  # type: str
+    path_help = "The path to the input file."  # type: str
     filter_help = 'The filter to process (e.g. "F606W").'  # type: str
 
     # Add arguments
     parser = argparse.ArgumentParser()  # type: argparse.ArgumentParser
-    parser.add_argument('path',
-                        type=str,
-                        default=os.getcwd(),
-                        help=path_help)
-    parser.add_argument('-f --filter',
-                        dest='filter',
-                        type=str,
-                        required=False,
-                        default='F606W',
-                        help=filter_help)
+    parser.add_argument("path", type=str, default=os.getcwd(), help=path_help)
+    parser.add_argument("-f --filter", dest="filter", type=str, required=False, default="F606W", help=filter_help)
 
     # Parse args
     args = parser.parse_args()  # type: argparse.Namespace
@@ -140,8 +132,7 @@ def parse_args() -> argparse.Namespace:
 
 
 @log_timing
-def some_other_function(an_int: int, a_float: float, a_bool: bool, a_list: List[Any],
-                        a_tuple: Tuple[Any], a_dict: Dict[Any, Any], an_obj: object) -> int:
+def some_other_function(an_int: int, a_float: float, a_bool: bool, a_list: List[Any], a_tuple: Tuple[Any], a_dict: Dict[Any, Any], an_obj: object) -> int:
     """This function just does a bunch of nonsense.
 
     But it serves as a decent example of some things.
@@ -170,8 +161,8 @@ def some_other_function(an_int: int, a_float: float, a_bool: bool, a_list: List[
     """
 
     # File I/O should be handeled with 'with open' when possible
-    with open('my_file', 'w') as f:
-        f.write('My favorite integer is {}'.format(an_int))
+    with open("my_file", "w") as f:
+        f.write("My favorite integer is {}".format(an_int))
 
     # Operators should be separated by spaces
     logging.info(a_float + a_float)
@@ -179,10 +170,9 @@ def some_other_function(an_int: int, a_float: float, a_bool: bool, a_list: List[
     return an_int
 
 
-if __name__ == '__main__':
-
+if __name__ == "__main__":
     # Configure logging
-    module = os.path.basename(__file__).strip('.py')
+    module = os.path.basename(__file__).strip(".py")
     configure_logging(module)
 
     args = parse_args()  # type: argparse.Namespace
diff --git a/style_guide/typing_demo/typing_demo_1.py b/style_guide/typing_demo/typing_demo_1.py
index 33c11e397..ad4bc30d0 100644
--- a/style_guide/typing_demo/typing_demo_1.py
+++ b/style_guide/typing_demo/typing_demo_1.py
@@ -7,8 +7,7 @@
 """
 
 import sys
-from typing import (List, Set, Dict, Tuple, Union, Optional, Callable,
-                    Iterable, Any)
+from typing import Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
 
 assert sys.version_info >= (3, 6)  # PEP 526 added variable annotations
 
@@ -18,7 +17,7 @@
 a_string: str = "jwql"
 a_list: List[int] = [1]
 a_set: Set[int] = {1, 2, 3}
-a_dict: Dict[str, bool] = {'jwql': True}  # Have to specify both keys and values
+a_dict: Dict[str, bool] = {"jwql": True}  # Have to specify both keys and values
 
 # For python versions prior to 3.6, the variable annotation syntax uses comments:
 #    annotated_variable = 1 # type: int
@@ -68,6 +67,7 @@ def a_generator() -> Iterable[int]:
 # Type annotations are stored in __annotations__, either as a local variable
 # or as an object attribute.
 
+
 def print_annotations(arg: Any) -> bool:
     if not hasattr(arg, "__annotations__"):
         print("Sorry, that argument doesn't have its own __annotations__.")
@@ -76,8 +76,7 @@ def print_annotations(arg: Any) -> bool:
     return bool(arg.__annotations__)
 
 
-for name in ["an_integer", "a_generic_function", "two_arg_function",
-             "func_alias", "anon_func", "a_generator"]:
+for name in ["an_integer", "a_generic_function", "two_arg_function", "func_alias", "anon_func", "a_generator"]:
     var = locals()[name]
     print(f"Annotations for {name}:")
     if not print_annotations(var):