PREVIEWING: heston/datastore-additions