Flesh out supervisor setup code more.