progress. Slightly broken because data.json changed