Add newfile

Still testing
Manual conflict resolution of newfile with best solution
Merge pull request #2 from Drenferalis/There/Dev

There/dev