fully updated to reflect state of runAll.txt
Cleaned up, although not yet tested