initial scraper commit
merge with server