Server Work 1.0

Changed some of the coding