Starting to use the new KVEngine etc abstractions, totally broken / not done yet.