Reformat data to ease transfer

Redo comp-spinner to accommodate one parameter at a time