Did some more stuff.

Slow going :-(