added TODOs to VC