Added client and start of a builder