I have now installed the new engine, a D1-30 with a 130 S saildrive, just got to finish the wiring to the control panel and Tacho.
All went fairly smoothly, and fits on the bed for the 2030d with out any modiifcations.
If anyone wants any more detials let me know