Too many changes, I should commit more often.