Expanded and updated TODO file