2 new TODO notes on refactors of collection