[WIP] Add delayed start and delayed restart

There is currently a problem on line 92 and line 115 of basic test suite that the FSM restarts.
This is patched on top of Pierce's merge.

(Although that status turns out to be handy if it is accurate!)