Added some TODOs
Signed-off-by: Laura Vasiliu <laura@laura.(none)>