another checkpoint commit
making it almost work
another tweak
and this is where we shall end for the night