Updated TODOes