Dist datastore refactor

Some changes to the dist-datstore and @Ignoring some tests to get past failures that aren't related, yet.
Man did you mix some concerns up in this thing. also i think we were doing the register in afterpropertiesset everywhere else