Update TODO

Adding ideas from forum