Updated todo with more thoughts :P