[+] Add TODO to fixes
Merge remote-tracking branch 'origin/newdhm' into newdhm