Techdebt staging

[jeremythuff]

Description

See #460 and #459

Fixes #457, #458

Type of change

Please delete options that are not relevant.

• [X] Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

• [X] Manual Local
• [X] Automated Local
• [X] Manual Dev
• [X] Automated Dev

Checklist:

• [X] My code follows the style guidelines of this project
• [X] I have performed a self-review of my code
• [X] I have commented my code, particularly in hard-to-understand areas
• [X] I have made corresponding changes to the documentation
• [X] My changes generate no new warnings
• [ ] I have added tests that prove my fix is effective or that my feature works
• [X] New and existing unit tests pass locally with my changes
• [X] Any dependent changes have been merged and published in downstream modules

[coveralls]

Coverage decreased (-0.02%) to 45.25% when pulling f9c0d90492164116f53a4800f42473d8f52518a0 on techdebt-staging into 6ebe87792375b5ed69d1bf5f469676477ac401b8 on main.