About to rename store namespace binder and do a bit of refactor.