Starting to add client pieces