Added the base of the client