Made Progress on the Client