I bought new smaller containers and went through all the parts bags. Good thing I did, I had a few expensive parts that were missing (including the still-backordered center sections). I think the new containers and extra shelf will work out well.