started adding client stuff