Lots of deployment changes to switch over to supervisor