More progress on todo example