Reverted Zeeshan's commit: TODOs for 1st week of August