Unify editor/upgrade/trade logic. Need to test trading still