I'm putting this in an MR because I don't have time tonight to do the required merging for filechooser