Refactor main loop to set up reboot.  Also some renaming.
Accidentally checked in some checkpoint files.
Prepare for solid state boot.
New lifecycle seems ready.