Merged with db_branch
Merge conflicts
Merge conflicts
Working on scraper
Merge conflicts
fixed merge stuff