merging branches
adding datastore api