Partway through rejigging.

Don’t touch for now.
Partway through rejigging 2

don’t touch for now.