First commit of my actual changes.