Made the client startable
Better names