Added zombie types.  Rebasing master.