Client in progress for milestone 4