issue #44: partial commit; still working on ModelBuilder