In the middle of making the esri stuff do anything.
Manual merge.