Storage and Filing

Make better use of storage & filing.