Updating our Output Formats

Despite the name of this branch, this is for output formats