Started on using unique_ptr. LOTS more to do.