finished up client section