now with todo