Storage actually looks like storage now!