GPII-547: Created some TODOs.