Copying Kielbasa over from the private repo.