More progress.

This is going to be a long night.