Please help - Thomas and Friends have taken over my home!

The Thomas invasion was already well underway, but the double-whammy of birthday and christmas have pushed it over the edge. I have a bin for the tracks but I need new storage solutions for the trains and the accessories.

The trains can't be simply thrown into a bin; they need to be "put to bed," bless their creepy little mechanical hearts. Up until now, I had an accordion-style spice rack mounted on the wall with just enough spaces for each train, but we need a lot more spaces now. I might just get another spice rack, but I'm open to other ideas.

The accessories (bridges, tunnels, stations, crossings, mine quarries, day spas... well, not that last one but it's only a matter of time) are large, unwieldy, and not as sturdy as you'd hope for the price, so they don't fit in a bin, and probably shouldn't be thrown in their anyway. Any space-efficient ideas for storage?