Beginning rewrite of additional scrapers