In May 1982, the International Committee of the Red Cross negotiated an agreement that facilitates prisoner of war exchanges from the Afghan conflict. Despite its creation, numerous problems exist that hinder its effective implementation. This Article examines those problems and discusses the benefits of these types of agreements. Ultimately, it is proposed that the ICRC should continue its efforts to develop these agreements to continue improving the international law that governs civil war and internal conflict.