Update TODO a bit with some ideas I have