Finishing up phone/tag integration