Checkpointing some changes. Don't think scrubby04 is going to work out, but some ideas in there.