Incremental commit, still a work in progress.