Added TODOs
Signed-off-by: Sho Nakatani <lay.sakura@gmail.com>