So much reworked for conductor. Macro commit :(
Another macro commit for worker changes