Complete rework of the xfer mechanism.  Compiles but not yet working.