Close to first pass done except for jobs