Week 5

I've set aside Django 3 migration work for a bit to focus on cleaning up the codebase and database queries. 

More on this later this week.