Added Vision TODOs