Changed TODO to the joint google doc