Experimental update to the Global Database code, Testing it now.