Last one before I make new clock changes

I will change the execution style of this code to have a clock-like
execution more or less driven by events. This is the last procedural
commit I will make before working on the clock.