Working Folder Merge

Merging files from working folder, hope this works lol