Adding Some Scrapping Code and Tests