Adding all of my latest changes.