Many changes and exchanges with Dynamic Factory.  All sources and tests now compile