Added client and server-classes
Added some stuff
Removed some foul lines