TODO comments added while reviewing code.