Started to do some changes to the server and client.