For sure, I'd be happy to squash these commits.