Merging files over from woflpy