Add filechooser
merge