Toy tool set with stuff you can build with it?

Our 2½ YO loves playing with my toolset, and I want to get him his own.

He loves the old Fisher Price set at his grandparents, which is still going strong nearly 40 years on. That set is sweet because it has a few "planks" and nuts and bolts, so you can build a few shapes by using the screwdriver and bit-driver to bolt it all together.