Made some changes to ManagementServer, currently testing those