Add some of full scraper; needs cleanup