Even more work on file transfer ...