More progress.
Basically done.