Add Client-Server part, not working right now.