Add more commentary in todo