Updated todo with some more thoughts.