move client kv to external file, start adding status support