Mods from MBpro. I'll need to roll these back so that the data is a structure and not a cell array.