OH: Break scraper back into one method. Nice. Nice.