WIP new supervisor