added enum and removed a non defensive client response
added server classes and updated some classes