Commit DataStoreBuilder

File 7/8 of initial code