Some code auditing, committing early to prevent conflicts