Updated Server

What Ive done so far with Server.