Refactor to new object model. Open, merge, save working.