Revert "Revert "I think this is the format that we're supposed to turn it in as.""

This reverts commit 98cccd3c27a8da9f0f2cc6d40ee1c611cd281abe.