Added the client stuff