WIP - SVN parts almost definitely regressed.  I don't plan to rest it ;-)  Should be close.