diff --git a/src/komodo.h b/src/komodo.h
index 9fe331708..e1c62bfa8 100644
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -187,8 +187,13 @@ int32_t komodo_parsestatefile(struct komodo_state *sp,FILE *fp,char *symbol,char
                     
 void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotaries,uint8_t notaryid,uint256 txhash,uint64_t voutmask,uint8_t numvouts,uint32_t *pvals,uint8_t numpvals,int32_t KMDheight,uint32_t KMDtimestamp,uint64_t opretvalue,uint8_t *opretbuf,uint16_t opretlen,uint16_t vout)
 {
-    static FILE *fp; static int32_t errs;
+    static FILE *fp; static int32_t errs,didinit;
     struct komodo_state *sp; char fname[512],symbol[16],dest[16]; int32_t ht,func; uint8_t num,pubkeys[64][33];
+    if ( didinit == 0 )
+    {
+        portable_mutex_init(&KOMODO_KV_mutex);
+        didinit = 1;
+    }
     if ( (sp= komodo_stateptr(symbol,dest)) == 0 )
     {
         KOMODO_INITDONE = (uint32_t)time(NULL);
diff --git a/src/komodo_gateway.h b/src/komodo_gateway.h
index 007b16b0b..304315104 100644
--- a/src/komodo_gateway.h
+++ b/src/komodo_gateway.h
@@ -671,6 +671,20 @@ int32_t komodo_check_deposit(int32_t height,const CBlock& block) // verify above
     return(0);
 }
 
+int32_t komodo_kvsearch(uint8_t value[IGUANA_MAXSCRIPTSIZE],uint8_t *key,int32_t keylen)
+{
+    struct komodo_kv *ptr; int32_t retval = -1;
+    portable_mutex_lock(&KOMODO_KV_mutex);
+    HASH_FIND(hh,KOMODO_KV,key,keylen,ptr);
+    if ( ptr != 0 )
+    {
+        if ( (retval= ptr->valuesize) != 0 )
+            memcpy(value,ptr->value,retval);
+    }
+    portable_mutex_unlock(&KOMODO_KV_mutex);
+    return(retval);
+}
+
 const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int32_t opretlen,uint256 txid,uint16_t vout,char *source)
 {
     uint8_t rmd160[20],rmd160s[64*20],addrtype,shortflag,pubkey33[33]; int32_t didstats,i,j,n,len,tokomodo,kmdheight,otherheights[64],kmdheights[64]; int8_t baseids[64]; char base[4],coinaddr[64],destaddr[64]; uint256 txids[64]; uint16_t vouts[64]; uint64_t convtoshis,seed; int64_t fiatoshis,komodoshis,checktoshis,values[64],srcvalues[64]; struct pax_transaction *pax,*pax2; struct komodo_state *basesp; double diff;
@@ -689,7 +703,36 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
     memset(kmdheights,0,sizeof(kmdheights));
     memset(otherheights,0,sizeof(otherheights));
     tokomodo = (komodo_is_issuer() == 0);
-    if ( opretbuf[0] == 'D' )
+    if ( opretbuf[0] == 'K' )
+    {
+        uint16_t keylen,valuesize; uint8_t *key,*value; struct komodo_kv *ptr;
+        iguana_rwnum(0,&opretbuf[1],sizeof(keylen),&keylen);
+        iguana_rwnum(0,&opretbuf[3],sizeof(valuesize),&valuesize);
+        key = &opretbuf[5];
+        value = &key[keylen];
+        if ( sizeof(keylen)+sizeof(valuesize)+keylen+valuesize+1 == opretlen )
+        {
+            portable_mutex_lock(&KOMODO_KV_mutex);
+            HASH_FIND(hh,KOMODO_KV,key,keylen,ptr);
+            if ( ptr == 0 )
+            {
+                ptr = calloc(1,sizeof(*ptr));
+                ptr->key = calloc(1,keylen);
+                ptr->keylen = keylen;
+                memcpy(ptr->key,key,keylen);
+                HASH_ADD_KEYPTR(hh,KOMODO_KV,ptr->key,ptr->keylen,ptr);
+            }
+            if ( ptr->value != 0 )
+                free(ptr->value), ptr->value = 0;
+            if ( (ptr->valuesize= valuesize) != 0 )
+            {
+                ptr->value = calloc(1,valuesize);
+                memcpy(ptr->value,value,valuesize);
+            }
+            portable_mutex_unlock(&KOMODO_KV_mutex);
+        } else printf("opretlen.%d mismatch keylen.%d valuesize.%d\n",opretln,keylen,valuesize);
+    }
+    else if ( opretbuf[0] == 'D' )
     {
         tokomodo = 0;
         if ( opretlen == 38 ) // any KMD tx
diff --git a/src/komodo_globals.h b/src/komodo_globals.h
index 08c80ff79..71d62eac1 100644
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -27,6 +27,7 @@ int32_t komodo_longestchain();
 pthread_mutex_t komodo_mutex;
 
 #define KOMODO_ELECTION_GAP 2000    //((ASSETCHAINS_SYMBOL[0] == 0) ? 2000 : 100)
+#define IGUANA_MAXSCRIPTSIZE 10001
 
 struct pax_transaction *PAX;
 int32_t NUM_PRICES; uint32_t *PVALS;
@@ -49,3 +50,6 @@ uint64_t ASSETCHAINS_SUPPLY = 10;
 uint32_t KOMODO_INITDONE;
 char KMDUSERPASS[4096],BTCUSERPASS[4096]; uint16_t BITCOIND_PORT = 7771;
 uint64_t PENDING_KOMODO_TX;
+
+struct komodo_kv *KOMODO_KV;
+portable_mutex_t KOMODO_KV_mutex;
\ No newline at end of file
diff --git a/src/komodo_structs.h b/src/komodo_structs.h
index d1da1d4c4..2bb827849 100644
--- a/src/komodo_structs.h
+++ b/src/komodo_structs.h
@@ -37,6 +37,8 @@
 #define KOMODO_OPRETURN_WITHDRAW 'W' // assetchain
 #define KOMODO_OPRETURN_REDEEMED 'X'
 
+struct komodo_kv { UT_hash_handle hh; uint8_t *key,*value; uint16_t keylen,valuesize; };
+
 struct komodo_event_notarized { uint256 blockhash,desttxid; int32_t notarizedheight; char dest[16]; };
 struct komodo_event_pubkeys { uint8_t num; uint8_t pubkeys[64][33]; };
 struct komodo_event_opreturn { uint256 txid; uint64_t value; uint16_t vout,oplen; uint8_t opret[]; };