First commit after switching to smart pointers