UniversalStorage

Updated dependencies, and formatting.  Should follow all guidelines now.