Connected OrderImporting to the program + some refacturing