Initial work on extracting files for sending