A lot of refactoring for working with the Server.
A lot of work to get the Server working.