Major push of all new code for the scrapper