Master/Server nearing completion