work in progress - adding datastore