Geodata

While not done, this is functioning well enough to merge in.