Flesh out client section a little