[PROJECT HEALTH] Mega Merge

[GuyWhoCode]

User Story

As a developer, I want to have our main branch reflect the current state of our project since its public release.

Technical Tasks

• Ensure that dev can merge to main.

Acceptance Criteria

• Main is up to date with the dev branch.