Got the todos listed correctly