Add basic server & client