Auto worker diff

ahmed from irc asked me to pull this into here for him, so he could merge it to his setup.