WIP 

Just opening a PR to get feedback on the re-factoring for Worker. Changes still in progress.
it's more succinct..I think we use this at other places as well.