Updated server, partially working now
Server update