Fannie-Freddie Bill Includes Billions for Affordable Housing