Some more progress, still missing Pillar data