refactored a LOT of the code, and removed threading from the scraper