add TODO notes by vincent