Revert "Revert "Incremental Save""

This reverts commit ccf41d516d66f5959b8d19e714e68cf3048276ba.