Incorporated bootstrap into server and client