Lots of cleanup.  Moving toward dynamic content.  Currently require a page refresh, but the State object is - for the most part - kept well enough in sync in a sane format.