Added additional TODO notes