Making progress on Client