A little more work on the importer.