Trade system is switched over (it's also very horrible and needs a complete rewrite, IMO -- this double-storage model is just dupes waiting to happen).