Added a TODO corresponding to the remarks that arose during the presentation last Friday