more todos

Signed-off-by: Nicholas Emil Bevacqua <nicholas.emil.bevacqua@gmail.com>