No progress, but some useful debugging code added.