Overhaul I3 of the merchant tutorial