mature job_card functionality working
merge conflict fix