Minor tweaks
Slowly, very slowly, trying to figure out how this will work.
Ok, yet more little tweaks.  It's actually doing something useful now ...