Added a TODO for Scalar