Working on getting unique pointers done