[bug] Adding some todos
[bug] Adding some todo