Updated ShotData, continued prep for cross reference between PBP & shot data