Progress towards refactor.  mid-work commit -- still messy.