Back to std::unique_ptr
Finally got this thing to build with std::unique_ptr