Refactored scraper to save & regen results