I spent some time on this today and made some progress.
Unfortunately, it is still going to require more time. There are some things that are being done differently and I'll have to untangle them before everything is going to work.
Please be patient.