Server and Connector Update

Working Server and Connector (Tested)