Refactor: start tracking jobs in the general code

this simplifies some of the stuffs