Working on kvstore assignment