Started the work to use shared pointers.