New Development issues

I had to restore my workspace from an offhand backup. I've done my beset
to restore my work plus a few enhancements but it hasn't been tested
yet.