Complete overhaul of scraping system