There is a repeating pattern in the struct that is split out into a subtype in this commit. This makes handling the data easier, as now done in the print routine.