job fully working. Some minor TODOs to check