Re-wrote inventory market helper code

Turned on now by default