Need to create dir first; clean up a bit, stop using File.join