Formatting
Starting to get most of the storage related stuff together.
...