[WIP] JobQueue adjustments