Start work on new DataStore type