Expanded server, started the re-write of the client