Working on the import feature