Some work on datastore done