Squished all of the commits, the PR should be done now.