Add newfile

Still testing
Add newfile

dont keep this version
add uneeded changes
Manual conflict resolution of newfile with best solution