Rob

Yeah, better. This is also on the factory gmail account, but it's so good it's here as well. This is still in progress. If you guys have any comments, better get them in quick.

EDIT: For instance, I just realized Bordermarch and Vesbridge are in the wrong locations.