Changed: Managed the TODOs while adding them to the issue-tracker