wip checkpoint
Partial conversion from OwnPtr to std::unique_ptr