Work done to merge to set it up for merging a wider variety of file types