It's been several years, so my pieces probably aren't up to date, but I had a potato head parts addiction when my kids were young. One thing in your favor is that you have a boy and won't need all the princess pieces, lol. Packing parts became a huge challenge for me and was one of my favorite parts of my trips. I would take a shopping basket at Once Upon a Toy at DTD and fill it with all the parts I wanted and then find an empty corner and dump everything on the floor and strategically pack the box to fit as many pieces as possible. Yes, I'm insane, but I got a LOT of pieces in the box! Have fun!