* Add a todo (not a ticket yet) prompted by @clkao