Failed Conversion

Reverting to assimilate other features into old version. For now, I'll
leave the XY conversion, but I went about it the wrong way for this, as
I made too many independent changes to isolate the causes of the new
bugs.