adds vs scrape
Merge branch 'james'