adding rest of scrape features, testing