halfway through fixing the supplier sort thing
merge