Code

Partial 2geom update (anticipating changes that will be part of the next major update...