Ok. Going to put up a different PR for this.