More progress.

Going to continue later...