Beginning to remove wrappers in favor of simply shared_ptrs