Add todo for my own benefit