Reverted to pre-shared_ptr edition.
Next attempt!