Completely redid Connect scraping