first pass at moving jobs out of class methods