Incremental commit (tests are still broken)