Updated todo
Changed data source to new map-reduce view