Sen. Tom Harkin has introduced The Guantanamo Closure Act of 2007. From the ACLU:

The ACLU today welcomed Senator Tom Harkin's (D-IA) introduction of the Guantanamo Bay Detention Facility Closure Act of 2007, a bill that would close the U.S. detention facility at Guantanamo Bay, Cuba. The bill cuts off funds for everything except sending charged or sentenced detainees to Fort Leavenworth and transferring the remaining detainees to their home countries or other countries that will not torture or abuse them. The bill would effectively end the practice of indefinite detention without charge or due process for detainees who have been held for as long as five years without charge and without knowing the reason for their detention. It will also provide an incentive for the government to finally charge those detainees the government believes are guilty of crimes against the United States.

More...