Peter - switched the fields reference over to using a list instead a dictionary so an order could be easily maintained