TODO -> IDEAS

(cherry picked from commit f0c418b2eb98abfacb1a1a017d36f6ed6d0fa8b9)