KV and SerDe stuff - WIP