Still re-working automation...
Mostly have the new, fixed automation working again...  Still various tuning
to do, but automation is now somewhere between idiot-proof and future-proof.