Turn TODOs into issues for easier tracking

[AbhinavMir]

Example here - this todo is pretty simple to do (and highly suggested). This can be a starting point, but todos as issues are easier to tackle. Can take it up.