Added more to scraper (not finished)