change a bunch of stuff
abstract out filenames, put different runs in different dirs