Now we have 2 separate implementations of kvstore... Have to deal with that.