Added switches to server code

Began adding switches to server code.
Switches not applying properly.