Edits.

Some restructuring to indicate work has begun again.