Improved scraper, checking in working markers before refactoring.