Shuffle things around, setup supervisor