Progress on reorg handling ... still completely broken