get about halfway through moving the geo sources out of the headers