Update TODOs

Now need to unify data/logic with CSV.