Moving ongoing work into SVN; don't try to use this version.