My son is nearly five and obsessed with Legos. He plays all day, every day pretty much. I think Legos are the best so I love that he has so much independent play with them.... but as we're approaching arrival of baby #2 I've started to think of the logistics. Right now, we keep them in the IKEA trofast storage units in his bedroom, but he occasionally plays legos out in the livingroom or elsewhere and I constantly find random pieces.

If you had an older kid and baby, how did you deal with baby proofing in regards to big kid toys? I don't want to have to restrict his play,but I also don't want to restrict baby as the baby becomes mobile.