More progress.

Still hangs.