Commit before huge refactoring involving Contracts