Solves the reconstruction problem, and eliminates an insidious core dump. All tests pass.