Work in progress

This is pretty much where we left it. I finished the change apply the new patch in `reconstructRight`, which had some minor fallout. But that did not fix the problem.