added logging/datastore