Trade update started
Trade mostly functional
Small trade tweaks
Expansions functional
Deleted faulty test stubs