bugfix and starting datastore modelling