Revert 'Goods' commit - have a better concept