More rewriting on the variation importer.  Mostly finished now.