ADD: Communication between client/server fixed and working