more rework.  compiles.