re #17 simplifying the data storage and bandaid for sort