Re-work of importing files - not yet complete