added delete and all datastore stuff