Merge branch 'middle' into feature-rankings
Merge branch 'feature-rankings' into middle
built populating functitons for db.py
trying to merge