I have switched to (cup-style) deli containers for 90% of food storage now. They are cheap, stack great, hold up well if you drop them, and easy to wash and store.