I would love to squash these commits together.