Add new files
Using emplace and move now, still issues with Unique