More progress, to fixup