Blobstore changes

Should be the version from our last demonstration