This research study will investigate the safety and effectiveness of weight loss surgery for overweight persons with type 2 diabetes. Eligible patients will undergo one of 2 types of weight loss surgery, Roux-en-Y gastric bypass, or laparoscopic adjustable gastric banding, or an intensive lifestyle modification. Participants will be closely followed for one year to compare the effects of these treatments on diabetes remission.