Job Nim - refactor to take care of pmd debt