Changed the way that services are started/stoped.