Add a bunch of tests, change filenames, add logging, add formats, etc.