Supervisor in progress - Deep refactor