Some work towards converting some of the arrays from the old format to the new