Re-Merge TODO.md

Old pull-request was accidentally overridden