To avoid confusing anyone until I'm done, I've removed some of the outdated parts that are broken in two.  I'll rebuild them after V1.0