Start adding server support to the client