Now handles switching messages from client