Added different client/server stuff (UNFINISHED)