Add and comment TODOs
2 files changed