Reverting to commit New Version

Reverting to before the Conversion, because I messed up doing it
properly, and didn't test along the way, and altered stuff half way
through - big mess. Starting back at the last working version, and
changing (then testing) each bit at a time.