Copying Andouille over from the private repo.