WIP refactor for dynamic n_jobs