Changes made to get main into a working state for the user testing in class on wednesday
Merge remote-tracking branch 'origin/dev' into dev