Added some TODOs in CameraDisplay so I don't forget about them