Made more progress on client