cleanup
datastore progress and basic tests