I think it is time to consider moving agencies out of Washington D.C. With the advent of modern technology, there is no physical need to have the "head office" of every agency and bureau in the fetid Swamp that is the Federal District.  There are few places richer than the greater DC metro and it's really time to spread the government wealth around into fly-over country.