Started implementing #4 & #5. More scraper patches.