Reworking import, testing needed...