Breaking out client and master
Change to server, instead of master