Moved data scrape up and out of the way

We can use this later if needed