Changing from Champion objects holding the bulk of the data to World objects doing so