Adding much work, including GAM for pitch-type/location