Storage Overhaul

A complete overhaul of storage containers.