Updated TODO with some more ideas