Update!

Major revisions to code, but now that I'm trying to test it...  some
very odd errors.