Moving these over from the private repo.