More data and todos