Job/tasks worker

This fixes #431 and fixes #447.
keep it in sync :) I'm nitpicking, nevermind