Tiny nit-pick; The tracking device has been done. Come up with another way.
Done to death, I agree, but I liked the twist of the tracking device being Leia’s droid. That’s actually pretty cruel. It seems like Lola has been her constant companion for years.