More todo comments added