Added stuff to use Craig's key value store, partially