Combined all of my commits.