Better wraparound, importer now executable