I'll save it for another PR and merge this.