Adding Server (This is not refactored one, not sure if live client is the refactored version)