Major updates! (client and server done!)