Server edit attempt

Finally done. Hope you like it!