Full scraper re-write