Most of the server definition has been cut, we should either cut it completely or add the rest back. Which way do we want to go?
Blaine