Adding scrapping component and logic backbone