working on debug issue #100, datastore methods and abstraction layer