Done..

Server code not included
small bug