This will hopefully mean we don't have to generate 2 sets of output files and alot less code duplication.