More work on the run framework.

In case anyone is wondering, I only have a little time each day to work
on this, so I'm moving forward in small steps.