Add servers. Rename supervisor to more closely match what it is supervising.