Progress on keybase/keybase#204