Refactored Controll.Zombie. Fixes #9