Adding client server shit