Bunch more changes.  Not compilable.