More re-working of Kh.  Pretty much everything is working except regs