refactor graphs and binder to allow manual re-process