Add lots of commented-out debugging code, all to try to catch