Somewhat working version of the multi-file handling
Somewhat working version of the multi-file handling