Add a TODO note
Fix potential problems with spaces in filenames