Starting to rework the controller based on the new importer