Overhaul the import as we know it