stripping out and starting over, incremental commit