Dist datastore refactor

Some changes to the dist-datstore and @Ignoring some tests to get past failures that aren't related, yet.
I think an at ignore would be better here, so we remember to come back to it. otherwise this might descend into a black hole