Reverted scraper back to original state. About to do big overhaul