Cleaning up files, testing. I think this is dumping correctly, but I'm not sure yet.