Added initial Client and Server classes