Add TODOs and ideas from last time.