- Merging shapes is mostly finished
- Updated for changes in DDogleg and GeoRegression