Add in virtual fields for Cell and add in ordering to make better sense of the Json