Make into module, plus support joboffers