More progress
Cleaning up.