Committing in order to merge changes
Refactoring open/read/import file logic wip