More fixes to the new automation...  This feature is going to be tough,
it might take a few days or even a week, rather than my  usual 1-2 days
for writing huge features...