Datastore is complete, working on test code