Further work on scraper

Have put some more functionality in the scraper file, and started on the
data storing and retrieval functions.