Commit before refactor into component system.