many changes.  Does not compile ...again.
More files added.