Updates to client. Not finished yet