The speech therapist whose been coming to help us work with Baby G on his language development suggested better organizing our toys so he has to request them. She uses big 2 gallon ziplock bags, but I figured upcycled containers would work even better.
It’s also nice because it keeps all similar pieces together and we can pick up our toys as we play with them (theoretically). Ie. “Before you get to play with Mr. Potato Head, let’s put all of our cars in the bag.” I generally get more cooperation for cleanup when he wants something else so this often works.