Completed a lot of changes.  Getting scared about losing stuff so committing.  I will refactor in a subsequent commit.