Added the other colleague who contributed to my hacky internal version of this.