Adding a client and server class