This syncs up the cyclone-timer code w/ Greg's changes from this morning.
Attach a file by drag & drop or click to upload
