Working out some of the weirdness with non-default type mappings.  Also added in goods for drivers (and their licenses).