Finishing up client and server