Commit before 12/6 class. Revert if needed
Separate commit before 12/6 class