Fixup todo, add extended key.